kmx git

src/annotated_commit.h

Commit	Date	Message
7730fe8e	2015-11-09T13:01:48	merge: merge annotated commits instead of regular commits
3f2bb387	2015-10-28T11:00:55	merge: octopus merge common ancestors when >2 When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.
18b00406	2014-10-03T19:02:29	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.