summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
Commit message (Expand)AuthorAgeFilesLines
* merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirsJunio C Hamano2018-01-031-0/+32
* attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
* merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-1/+13
* Convert "! git" to "test_must_fail git"Jared Hance2010-07-201-1/+1
* Teach git-pull to pass -X<option> to git-mergeAvery Pennarun2010-01-171-0/+8
* git merge -X<option>Avery Pennarun2010-01-171-0/+56