Jacques Germishuys 6fefb7af84 Capture conflict information in MERGE_MSG for revert and merge		2014-04-14 16:16:22 +02:00
..
analysis.c	UNBORN implies FAST_FORWARD	2014-03-20 09:35:22 -07:00
dirty.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
renames.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
setup.c	Introduce git_merge_head_id	2014-03-31 11:43:38 -05:00
simple.c	Capture conflict information in MERGE_MSG for revert and merge	2014-04-14 16:16:22 +02:00
submodules.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
trivial.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00