Edward Thomson eff531e103 Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE		2014-05-27 20:58:20 -05:00
..
analysis.c	Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCE	2014-05-27 20:58:20 -05:00
dirty.c	merge: checkout default shouldn't clobber given	2014-04-23 19:43:35 -04: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	merge: checkout default shouldn't clobber given	2014-04-23 19:43:35 -04: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