Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'
[gitweb.git] / t / t7605-merge-resolve.sh
2008-07-13 Add a new test for git-merge-resolve