Edward Thomson fa78782f67 merge: rename git_merge_tree_flags_t -> git_merge_flags_t		2015-11-25 15:37:05 -05:00
..
bare.c	git_cherry_pick -> git_cherrypick	2014-07-22 10:40:23 -04:00
workdir.c	merge: rename git_merge_tree_flags_t -> git_merge_flags_t	2015-11-25 15:37:05 -05:00