thodg/libgit2/src/merge_file.h

---

src/merge_file.h

---

Log

Author	Commit	Date	CI	Message
	e651e8e2	2014-01-19T15:05:08		Introduce diff3 mode for checking out conflicts
	c1d648c5	2014-01-08T18:29:42		merge_file should use more aggressive levels The default merge_file level was XDL_MERGE_MINIMAL, which will produce conflicts where there should not be in the case where both sides were changed identically. Change the defaults to be more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively compress non-conflicts. This matches git.git's defaults. Increase testing around reverting a previously reverted commit to illustrate this problem.
	1fed6b07	2013-05-13T21:57:37		Fix trailing whitespaces
	bec65a5e	2013-04-01T22:16:21		merge!