kmx git

src/merge.h

Commit	Date	Message
ad2bc32f	2013-01-03T15:53:50	expose merge metadata cleanup
4ff192d3	2012-11-26T19:47:47	Move merge functions to merge.c In so doing, promote commit_list to git_commit_list, with its own internal API header.
632d8b23	2012-10-23T15:42:09	reset changes for merge