Edward Thomson d362093f9e Introduce GIT_MERGE_CONFIG_* for merge.ff settings ... git_merge_analysis will now return GIT_MERGE_CONFIG_NO_FASTFORWARD when merge.ff=false and GIT_MERGE_CONFIG_FASTFORWARD_ONLY when merge.ff=true		2014-05-27 20:49:16 -05:00
..
trees	Update git_merge_tree_opts to git_merge_options	2014-03-20 09:25:08 -07:00
workdir	Introduce GIT_MERGE_CONFIG_* for merge.ff settings	2014-05-27 20:49:16 -05: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