github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Expand)	Author
2015-03-16	Added options to enable patience and minimal diff drivers	Jacques Germishuys
2015-03-16	Collapse whitespace flags into git_merge_file_flags_t	Jacques Germishuys
2015-03-16	Allow for merges with whitespace discrepancies	Jacques Germishuys
2014-04-01	Cleanups	Russell Belfer
2014-03-31	Const up members of git_merge_file_result	Edward Thomson
2014-03-20	Introduce git_merge_file for consumers	Edward Thomson
2014-01-25	diff: rename the file's 'oid' to 'id'	Carlos Martín Nieto
2014-01-25	index: rename an entry's id to 'id'	Carlos Martín Nieto
2014-01-21	Support union merges	Edward Thomson
2014-01-21	Introduce diff3 mode for checking out conflicts	Edward Thomson
2014-01-21	merge_file should use more aggressive levels	Edward Thomson
2013-10-17	checkout (from index) can write conflicts	Edward Thomson
2013-05-16	Fix trailing whitespaces	nulltoken
2013-05-01	merge!	Edward Thomson