summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsLibravatar David Aguilar1-0/+25
2016-03-10mergetool: support delete/delete conflictsLibravatar David Aguilar1-0/+39
2015-09-08t7610: don't use test_config in a subshellLibravatar John Keeping1-1/+1
2014-10-21Merge branch 'da/mergetool-temporary-directory'Libravatar Junio C Hamano1-0/+23
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempLibravatar David Aguilar1-0/+23
2014-10-16t7610-mergetool: use test_config to isolate testsLibravatar David Aguilar1-5/+3
2014-10-15t7610-mergetool: prefer test_config over git configLibravatar David Aguilar1-11/+9
2014-10-15t7610-mergetool: add missing && and remove commented-out codeLibravatar David Aguilar1-8/+2
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesLibravatar David Aguilar1-459/+459
2013-08-06rm: delete .gitmodules entry of submodules removed from the work treeLibravatar Jens Lehmann1-3/+3
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini1-1/+1
2012-10-01Merge branch 'da/mergetool-custom'Libravatar Junio C Hamano1-0/+13
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-0/+13
2012-08-17stash: invoke rerere in case of conflictLibravatar Phil Hord1-1/+1
2012-08-17test: git-stash conflict sets up rerereLibravatar Phil Hord1-0/+38
2012-01-23mergetool: Provide an empty file when neededLibravatar David Aguilar1-1/+27
2011-09-26mergetool: Use args as pathspec to unmerged filesLibravatar Jonathon Mah1-18/+40
2011-04-13mergetool: Teach about submodulesLibravatar Jonathon Mah1-3/+287
2011-02-16mergetool: don't skip modify/remove conflictsLibravatar Martin von Zweigbergk1-6/+34
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2010-08-24t7610: cd inside subshell instead of aroundLibravatar Brian Gernhardt1-23/+26
2010-08-17mergetool: Skip autoresolved pathsLibravatar David Aguilar1-12/+34
2009-01-31mergetool: fix running mergetool in sub-directoriesLibravatar Charles Bailey1-1/+1
2009-01-31mergetool: Add a test for running mergetool in a sub-directoryLibravatar Charles Bailey1-19/+51
2009-01-27mergetool: respect autocrlf by using checkout-indexLibravatar Charles Bailey1-2/+13
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-1/+1
2008-07-04Fix executable bits in t/ scriptsLibravatar Junio C Hamano1-0/+0
2008-03-05Add a very basic test script for git mergetoolLibravatar Charles Bailey1-0/+46
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 12:14:08 +0000