summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2026-07-06t: convert grep assertions to test_grepMichael Montalbo1-9/+9
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-29/+11
2024-12-10Merge branch 'pb/mergetool-errors'Junio C Hamano1-0/+8
2024-11-25git-mergetool--lib.sh: add error message if 'setup_user_tool' failsPhilippe Blain1-0/+8
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-11-04diff-lib: fix leaking diffopts in `do_diff_cache()`Patrick Steinhardt1-0/+1
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-0/+38
2022-11-15t7610: use "file:///dev/null", not "/dev/null", fixes MinGWÆvar Arnfjörð Bjarmason1-2/+2
2022-11-09t7610: fix flaky timeout issue, don't clone from example.comÆvar Arnfjörð Bjarmason1-2/+2
2021-02-17Merge branch 'sh/mergetool-hideresolved'Junio C Hamano1-0/+18
2021-02-09mergetool: add hideResolved configurationSeth House1-0/+18
2021-01-25Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano1-87/+90
2021-01-15Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano1-0/+11
2021-01-06mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain1-0/+11
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-88/+88
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren1-3/+29
2019-06-12t7610-mergetool: use test_cmp instead of test $(cat file) = $txtJohannes Sixt1-45/+90
2019-06-10t7610-mergetool: do not place pipelines headed by `yes` in subshellsJohannes Sixt1-85/+85
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu1-0/+19
2019-04-25t7610: add mergetool --gui testsDenton Liu1-0/+22
2019-04-25t7610: unsuppress outputDenton Liu1-61/+61
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano1-2/+1
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor1-2/+1
2018-08-20Merge branch 'ab/test-must-be-empty-for-master'Junio C Hamano1-2/+1
2018-07-30tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason1-2/+1
2018-07-03t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine1-4/+4
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller1-2/+2
2017-01-18Merge branch 'rh/mergetool-regression-fix'Junio C Hamano1-114/+165
2017-01-18Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano1-1/+1
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen1-1/+6
2017-01-10t7610: add test case for rerere+mergetool+subdir bugRichard Hansen1-1/+20
2017-01-10t7610: spell 'git reset --hard' consistentlyRichard Hansen1-18/+19
2017-01-10t7610: don't assume the checked-out commitRichard Hansen1-6/+6
2017-01-10t7610: always work on a test-specific branchRichard Hansen1-2/+8
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen1-2/+0
2017-01-10t7610: run 'git reset --hard' after each test to clean upRichard Hansen1-0/+8
2017-01-10t7610: don't rely on state from previous testRichard Hansen1-0/+6
2017-01-10t7610: use test_when_finished for cleanup tasksRichard Hansen1-34/+37
2017-01-10t7610: move setup code to the 'setup' test caseRichard Hansen1-30/+35
2017-01-10t7610: update branch names to match test numberRichard Hansen1-41/+41
2017-01-07don't use test_must_fail with grepPranit Bauva1-1/+1
2016-12-16Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano1-1/+2
2016-11-29t7610: clean up foo.XXXXXX tmpdirJeff King1-1/+2
2016-10-11mergetool: honor -O<orderfile>David Aguilar1-0/+27
2016-10-11mergetool: honor diff.orderFileDavid Aguilar1-0/+33
2016-07-06t7610: test for mktemp before test executionArmin Kunaschik1-1/+6
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar1-0/+25
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar1-0/+39
2015-09-08t7610: don't use test_config in a subshellJohn Keeping1-1/+1
generated by cgit (git 2.54.0.dirty) at 2026-09-13 19:16:52 +0000