summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLibravatar Lars Hjemli1-0/+54
2007-09-23Add test-script for git-merge porcelainLibravatar Lars Hjemli1-0/+344