summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-181-114/+165
|\
| * mergetool: fix running in subdir when rerere enabledrh/mergetool-regression-fixRichard Hansen2017-01-101-1/+6
| * t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-101-1/+20
| * t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-101-18/+19
| * t7610: don't assume the checked-out commitRichard Hansen2017-01-101-6/+6
| * t7610: always work on a test-specific branchRichard Hansen2017-01-101-2/+8
| * t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-101-2/+0
| * t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-101-0/+8
| * t7610: don't rely on state from previous testRichard Hansen2017-01-101-0/+6
| * t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-101-34/+37
| * t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-101-30/+35
| * t7610: update branch names to match test numberRichard Hansen2017-01-101-41/+41
* | Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano2017-01-181-1/+1
|\ \ | |/ |/|
| * don't use test_must_fail with grepPranit Bauva2017-01-071-1/+1
* | Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano2016-12-161-1/+2
|\ \ | |/ |/|
| * t7610: clean up foo.XXXXXX tmpdirak/lazy-prereq-mktempJeff King2016-11-291-1/+2
* | mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-0/+27
* | mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+33
|/
* t7610: test for mktemp before test executionArmin Kunaschik2016-07-061-1/+6
* mergetool: honor tempfile configuration when resolving delete conflictsda/mergetool-delete-delete-conflictDavid Aguilar2016-03-101-0/+25
* mergetool: support delete/delete conflictsDavid Aguilar2016-03-101-0/+39
* t7610: don't use test_config in a subshellJohn Keeping2015-09-081-1/+1
* Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-211-0/+23
|\
| * t7610-mergetool: add test cases for mergetool.writeToTempda/mergetool-temporary-directoryDavid Aguilar2014-10-161-0/+23
| * t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-161-5/+3
* | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-151-11/+9
|/
* t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-151-8/+2
* t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-151-459/+459
* rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-061-3/+3
* Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-1/+1
* Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-011-0/+13
|\
| * mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-251-0/+13
* | stash: invoke rerere in case of conflictPhil Hord2012-08-171-1/+1
* | test: git-stash conflict sets up rererePhil Hord2012-08-171-0/+38
|/
* mergetool: Provide an empty file when neededda/maint-mergetool-twowayDavid Aguilar2012-01-231-1/+27
* mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-261-18/+40
* mergetool: Teach about submodulesJonathon Mah2011-04-131-3/+287
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-161-6/+34
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* t7610: cd inside subshell instead of aroundBrian Gernhardt2010-08-241-23/+26
* mergetool: Skip autoresolved pathsDavid Aguilar2010-08-171-12/+34
* mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-311-1/+1
* mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey2009-01-311-19/+51
* mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-271-2/+13
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-1/+1
* Fix executable bits in t/ scriptsJunio C Hamano2008-07-041-0/+0
* Add a very basic test script for git mergetoolCharles Bailey2008-03-051-0/+46
View Lorry Controller Status