Move merge functions to merge.c In so doing, promote commit_list to git_commit_list, with its own internal API header.
2012-11-26T19:47:47