summaryrefslogtreecommitdiff
path: root/t/t7609-merge-abort.sh
Commit message (Expand)AuthorAgeFilesLines
* Avoid duplicate test number t7609Johannes Sixt2010-12-131-313/+0
* Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland2010-11-171-0/+313