thodg/libgit2/src/merge_file.c

---

src/merge_file.c

---

Log

Author	Commit	Date	CI	Message
	629b661c	2013-07-17T09:49:56		checkout (from index) can write conflicts
	1fed6b07	2013-05-13T21:57:37		Fix trailing whitespaces
	bec65a5e	2013-04-01T22:16:21		merge!