thodg/libgit2/tests/checkout/conflict.c

---

tests/checkout/conflict.c

---

Log

Author	Commit	Date	CI	Message
	a2ce19ca	2014-02-05T13:35:26		Prevent user's merge.conflictstyle from breaking tests
	d541170c	2014-01-24T11:36:41		index: rename an entry's id to 'id' This was not converted when we converted the rest, so do it now.
	17820381	2013-11-14T14:05:52		Rename tests-clar to tests