Edward Thomson d9fdee6e4c Remove git_merge_result as it's now unnecessary		2014-03-20 09:25:09 -07:00
..
dirty.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
renames.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
setup.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
simple.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -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	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
trivial.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00