Age | Commit message (Expand) | Author | Files | Lines |
2020-10-26 | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren | 1 | -3/+29 |
2019-06-12 | t7610-mergetool: use test_cmp instead of test $(cat file) = $txt | Johannes Sixt | 1 | -45/+90 |
2019-06-10 | t7610-mergetool: do not place pipelines headed by `yes` in subshells | Johannes Sixt | 1 | -85/+85 |
2019-05-13 | mergetool: fallback to tool when guitool unavailable | Denton Liu | 1 | -0/+19 |
2019-04-25 | t7610: add mergetool --gui tests | Denton Liu | 1 | -0/+22 |
2019-04-25 | t7610: unsuppress output | Denton Liu | 1 | -61/+61 |
2018-08-27 | Merge branch 'sg/test-must-be-empty' | Junio C Hamano | 1 | -2/+1 |
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>' | SZEDER Gábor | 1 | -2/+1 |
2018-08-20 | Merge branch 'ab/test-must-be-empty-for-master' | Junio C Hamano | 1 | -2/+1 |
2018-07-30 | tests: make use of the test_must_be_empty function | Ævar Arnfjörð Bjarmason | 1 | -2/+1 |
2018-07-03 | t: use test_write_lines() instead of series of 'echo' commands | Eric Sunshine | 1 | -4/+4 |
2017-10-07 | tests: fix diff order arguments in test_cmp | Stefan Beller | 1 | -2/+2 |
2017-01-18 | Merge branch 'rh/mergetool-regression-fix' | Junio C Hamano | 1 | -114/+165 |
2017-01-18 | Merge branch 'pb/test-must-fail-is-for-git' | Junio C Hamano | 1 | -1/+1 |
2017-01-10 | mergetool: fix running in subdir when rerere enabled | Richard Hansen | 1 | -1/+6 |
2017-01-10 | t7610: add test case for rerere+mergetool+subdir bug | Richard Hansen | 1 | -1/+20 |
2017-01-10 | t7610: spell 'git reset --hard' consistently | Richard Hansen | 1 | -18/+19 |
2017-01-10 | t7610: don't assume the checked-out commit | Richard Hansen | 1 | -6/+6 |
2017-01-10 | t7610: always work on a test-specific branch | Richard Hansen | 1 | -2/+8 |
2017-01-10 | t7610: delete some now-unnecessary 'git reset --hard' lines | Richard Hansen | 1 | -2/+0 |
2017-01-10 | t7610: run 'git reset --hard' after each test to clean up | Richard Hansen | 1 | -0/+8 |
2017-01-10 | t7610: don't rely on state from previous test | Richard Hansen | 1 | -0/+6 |
2017-01-10 | t7610: use test_when_finished for cleanup tasks | Richard Hansen | 1 | -34/+37 |
2017-01-10 | t7610: move setup code to the 'setup' test case | Richard Hansen | 1 | -30/+35 |
2017-01-10 | t7610: update branch names to match test number | Richard Hansen | 1 | -41/+41 |
2017-01-07 | don't use test_must_fail with grep | Pranit Bauva | 1 | -1/+1 |
2016-12-16 | Merge branch 'ak/lazy-prereq-mktemp' | Junio C Hamano | 1 | -1/+2 |
2016-11-29 | t7610: clean up foo.XXXXXX tmpdir | Jeff King | 1 | -1/+2 |
2016-10-11 | mergetool: honor -O<orderfile> | David Aguilar | 1 | -0/+27 |
2016-10-11 | mergetool: honor diff.orderFile | David Aguilar | 1 | -0/+33 |
2016-07-06 | t7610: test for mktemp before test execution | Armin Kunaschik | 1 | -1/+6 |
2016-03-10 | mergetool: honor tempfile configuration when resolving delete conflicts | David Aguilar | 1 | -0/+25 |
2016-03-10 | mergetool: support delete/delete conflicts | David Aguilar | 1 | -0/+39 |
2015-09-08 | t7610: don't use test_config in a subshell | John Keeping | 1 | -1/+1 |
2014-10-21 | Merge branch 'da/mergetool-temporary-directory' | Junio C Hamano | 1 | -0/+23 |
2014-10-16 | t7610-mergetool: add test cases for mergetool.writeToTemp | David Aguilar | 1 | -0/+23 |
2014-10-16 | t7610-mergetool: use test_config to isolate tests | David Aguilar | 1 | -5/+3 |
2014-10-15 | t7610-mergetool: prefer test_config over git config | David Aguilar | 1 | -11/+9 |
2014-10-15 | t7610-mergetool: add missing && and remove commented-out code | David Aguilar | 1 | -8/+2 |
2014-10-15 | t7610-mergetool: use tabs instead of a mix of tabs and spaces | David Aguilar | 1 | -459/+459 |
2013-08-06 | rm: delete .gitmodules entry of submodules removed from the work tree | Jens Lehmann | 1 | -3/+3 |
2013-04-12 | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 1 | -1/+1 |
2012-10-01 | Merge branch 'da/mergetool-custom' | Junio C Hamano | 1 | -0/+13 |
2012-09-25 | mergetool--lib: Allow custom commands to override built-ins | David Aguilar | 1 | -0/+13 |
2012-08-17 | stash: invoke rerere in case of conflict | Phil Hord | 1 | -1/+1 |
2012-08-17 | test: git-stash conflict sets up rerere | Phil Hord | 1 | -0/+38 |
2012-01-23 | mergetool: Provide an empty file when needed | David Aguilar | 1 | -1/+27 |
2011-09-26 | mergetool: Use args as pathspec to unmerged files | Jonathon Mah | 1 | -18/+40 |
2011-04-13 | mergetool: Teach about submodules | Jonathon Mah | 1 | -3/+287 |
2011-02-16 | mergetool: don't skip modify/remove conflicts | Martin von Zweigbergk | 1 | -6/+34 |