Edward Thomson 02105a27f0 Change signature of git_merge to take merge and checkout opts		2014-03-20 09:25:07 -07:00
..
dirty.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
renames.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
setup.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
simple.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
status.c	Add git_merge_status to provide info about an upcoming merge	2014-03-20 09:25:06 -07:00
submodules.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00
trivial.c	Change signature of git_merge to take merge and checkout opts	2014-03-20 09:25:07 -07:00