Edward Thomson 1c0b6a38ba Remove fastforward / uptodate from git_merge		2014-03-20 09:25:06 -07:00
..
trees	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
workdir	Remove fastforward / uptodate from git_merge	2014-03-20 09:25:06 -07:00
files.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
merge_helpers.c	git_checkout_opts -> git_checkout_options	2014-03-06 09:44:51 -08:00
merge_helpers.h	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00