Jacques Germishuys 6fefb7af84 Capture conflict information in MERGE_MSG for revert and merge		2014-04-14 16:16:22 +02:00
..
trees	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
workdir	Capture conflict information in MERGE_MSG for revert and merge	2014-04-14 16:16:22 +02:00
files.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
merge_helpers.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
merge_helpers.h	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00