summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)Author
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller
2017-01-18Merge branch 'rh/mergetool-regression-fix'Junio C Hamano
2017-01-18Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen
2017-01-10t7610: add test case for rerere+mergetool+subdir bugRichard Hansen
2017-01-10t7610: spell 'git reset --hard' consistentlyRichard Hansen
2017-01-10t7610: don't assume the checked-out commitRichard Hansen
2017-01-10t7610: always work on a test-specific branchRichard Hansen
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen
2017-01-10t7610: run 'git reset --hard' after each test to clean upRichard Hansen
2017-01-10t7610: don't rely on state from previous testRichard Hansen
2017-01-10t7610: use test_when_finished for cleanup tasksRichard Hansen
2017-01-10t7610: move setup code to the 'setup' test caseRichard Hansen
2017-01-10t7610: update branch names to match test numberRichard Hansen
2017-01-07don't use test_must_fail with grepPranit Bauva
2016-12-16Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano
2016-11-29t7610: clean up foo.XXXXXX tmpdirJeff King
2016-10-11mergetool: honor -O<orderfile>David Aguilar
2016-10-11mergetool: honor diff.orderFileDavid Aguilar
2016-07-06t7610: test for mktemp before test executionArmin Kunaschik
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar
2015-09-08t7610: don't use test_config in a subshellJohn Keeping
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-25 00:57:02 (GMT)