Edward Thomson 18b00406c6 s/git_merge_head/git_annotated_commit ... Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.		2014-10-26 22:59:48 -04:00
..
analysis.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
dirty.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
renames.c	Remove git_merge_result as it's now unnecessary	2014-03-20 09:25:09 -07:00
setup.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
simple.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
submodules.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
trivial.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00