Edward Thomson a4e2c36a66 merge: checkout default shouldn't clobber given		2014-04-23 19:43:35 -04:00
..
trees	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
workdir	merge: checkout default shouldn't clobber given	2014-04-23 19:43:35 -04: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