Edward Thomson 02105a27f0 Change signature of git_merge to take merge and checkout opts		2014-03-20 09:25:07 -07:00
..
trees	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
workdir	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
files.c	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00
merge_helpers.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
merge_helpers.h	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00