summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks2023-04-051-0/+38
* t7610: use "file:///dev/null", not "/dev/null", fixes MinGWÆvar Arnfjörð Bjarmason2022-11-151-2/+2
* t7610: fix flaky timeout issue, don't clone from example.comÆvar Arnfjörð Bjarmason2022-11-091-2/+2
* Merge branch 'sh/mergetool-hideresolved'Junio C Hamano2021-02-171-0/+18
|\
| * mergetool: add hideResolved configurationSeth House2021-02-091-0/+18
* | Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano2021-01-251-87/+90
|\ \
| * | t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-88/+88
| * | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
| |/
* | Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano2021-01-151-0/+11
|\ \ | |/ |/|
| * mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain2021-01-061-0/+11
* | merge tests: expect improved directory/file conflict handling in ortElijah Newren2020-10-261-3/+29
|/
* t7610-mergetool: use test_cmp instead of test $(cat file) = $txtJohannes Sixt2019-06-121-45/+90
* t7610-mergetool: do not place pipelines headed by `yes` in subshellsJohannes Sixt2019-06-101-85/+85
* mergetool: fallback to tool when guitool unavailableDenton Liu2019-05-131-0/+19
* t7610: add mergetool --gui testsDenton Liu2019-04-251-0/+22
* t7610: unsuppress outputDenton Liu2019-04-251-61/+61
* Merge branch 'sg/test-must-be-empty'Junio C Hamano2018-08-271-2/+1
|\
| * tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor2018-08-211-2/+1
* | Merge branch 'ab/test-must-be-empty-for-master'Junio C Hamano2018-08-201-2/+1
|\ \ | |/
| * tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason2018-07-301-2/+1
* | t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine2018-07-031-4/+4
|/
* tests: fix diff order arguments in test_cmpsb/test-cmp-expect-actualStefan Beller2017-10-071-2/+2
* 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
View Lorry Controller Status