aboutsummaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Expand)AuthorAge
* mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar2016-03-10
* mergetool: support delete/delete conflictsDavid Aguilar2016-03-10
* t7610: don't use test_config in a subshellJohn Keeping2015-09-08
* Merge branch 'da/mergetool-temporary-directory'Junio C Hamano2014-10-21
|\
| * t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar2014-10-16
| * t7610-mergetool: use test_config to isolate testsDavid Aguilar2014-10-16
* | t7610-mergetool: prefer test_config over git configDavid Aguilar2014-10-15
|/
* t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar2014-10-15
* t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar2014-10-15
* rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-06
* Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-01
|\
| * mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-25
* | stash: invoke rerere in case of conflictPhil Hord2012-08-17
* | test: git-stash conflict sets up rererePhil Hord2012-08-17
|/
* mergetool: Provide an empty file when neededDavid Aguilar2012-01-23
* mergetool: Use args as pathspec to unmerged filesJonathon Mah2011-09-26
* mergetool: Teach about submodulesJonathon Mah2011-04-13
* mergetool: don't skip modify/remove conflictsMartin von Zweigbergk2011-02-16
* tests: add missing &&Jonathan Nieder2010-11-09
* t7610: cd inside subshell instead of aroundBrian Gernhardt2010-08-24
* mergetool: Skip autoresolved pathsDavid Aguilar2010-08-17
* mergetool: fix running mergetool in sub-directoriesCharles Bailey2009-01-31
* mergetool: Add a test for running mergetool in a sub-directoryCharles Bailey2009-01-31
* mergetool: respect autocrlf by using checkout-indexCharles Bailey2009-01-27
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* Fix executable bits in t/ scriptsJunio C Hamano2008-07-04
* Add a very basic test script for git mergetoolCharles Bailey2008-03-05
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 04:34:34 +0000