summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
AgeCommit message (Expand)Author
2010-07-20Convert "! git" to "test_must_fail git"Jared Hance
2010-01-18Teach git-pull to pass -X<option> to git-mergeAvery Pennarun
2010-01-18git merge -X<option>Avery Pennarun