t6021: add a new test for git-merge-resolve
[gitweb.git] / builtin-merge.c
2008-07-10 Teach merge.log to "git-merge" again
2008-07-08 Build in merge