Revert "git-add--interactive: remove hunk coalescing"
[git] / t / t7605-merge-resolve.sh
2008-07-13  Miklos VajnaAdd a new test for git-merge-resolve