summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)Author
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar
2014-10-16t7610-mergetool: use test_config to isolate testsDavid Aguilar
2014-10-15t7610-mergetool: prefer test_config over git configDavid Aguilar
2014-10-15t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar
2013-08-06rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-08-17stash: invoke rerere in case of conflictPhil Hord
2012-08-17test: git-stash conflict sets up rererePhil Hord
2012-01-23mergetool: Provide an empty file when neededDavid Aguilar
2011-09-26mergetool: Use args as pathspec to unmerged filesJonathon Mah
2011-04-13mergetool: Teach about submodulesJonathon Mah
2011-02-16mergetool: don't skip modify/remove conflictsMartin von Zweigbergk
2010-11-09tests: add missing &&Jonathan Nieder
2010-08-24t7610: cd inside subshell instead of aroundBrian Gernhardt
2010-08-17mergetool: Skip autoresolved pathsDavid Aguilar
2009-01-31mergetool: fix running mergetool in sub-directoriesCharles Bailey
2009-01-31mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey
2009-01-27mergetool: respect autocrlf by using checkout-indexCharles Bailey
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-07-04Fix executable bits in t/ scriptsJunio C Hamano
2008-03-05Add a very basic test script for git mergetoolCharles Bailey