summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
AgeCommit message (Expand)AuthorFilesLines
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverLibravatar Junio C Hamano1-1/+1
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverLibravatar Junio C Hamano1-1/+13
2010-07-20Convert "! git" to "test_must_fail git"Libravatar Jared Hance1-1/+1
2010-01-17Teach git-pull to pass -X<option> to git-mergeLibravatar Avery Pennarun1-0/+8
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-0/+56