summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)Author
2021-02-18Merge branch 'sh/mergetool-hideresolved'Junio C Hamano
2021-02-09mergetool: add hideResolved configurationSeth House
2021-01-25Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano
2021-01-16Merge branch 'pb/mergetool-tool-help-fix'Junio C Hamano
2021-01-07mergetool--lib: fix '--tool-help' to correctly show available toolsPhilippe Blain
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2019-06-12t7610-mergetool: use test_cmp instead of test $(cat file) = $txtJohannes Sixt
2019-06-10t7610-mergetool: do not place pipelines headed by `yes` in subshellsJohannes Sixt
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu
2019-04-25t7610: add mergetool --gui testsDenton Liu
2019-04-25t7610: unsuppress outputDenton Liu
2018-08-27Merge branch 'sg/test-must-be-empty'Junio C Hamano
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor
2018-08-20Merge branch 'ab/test-must-be-empty-for-master'Junio C Hamano
2018-07-30tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason
2018-07-03t: use test_write_lines() instead of series of 'echo' commandsEric Sunshine
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller
2017-01-18Merge branch 'rh/mergetool-regression-fix'Junio C Hamano
2017-01-18Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano
2017-01-10mergetool: fix running in subdir when rerere enabledRichard Hansen
2017-01-10t7610: add test case for rerere+mergetool+subdir bugRichard Hansen
2017-01-10t7610: spell 'git reset --hard' consistentlyRichard Hansen
2017-01-10t7610: don't assume the checked-out commitRichard Hansen
2017-01-10t7610: always work on a test-specific branchRichard Hansen
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen
2017-01-10t7610: run 'git reset --hard' after each test to clean upRichard Hansen
2017-01-10t7610: don't rely on state from previous testRichard Hansen
2017-01-10t7610: use test_when_finished for cleanup tasksRichard Hansen
2017-01-10t7610: move setup code to the 'setup' test caseRichard Hansen
2017-01-10t7610: update branch names to match test numberRichard Hansen
2017-01-07don't use test_must_fail with grepPranit Bauva
2016-12-16Merge branch 'ak/lazy-prereq-mktemp'Junio C Hamano
2016-11-29t7610: clean up foo.XXXXXX tmpdirJeff King
2016-10-11mergetool: honor -O<orderfile>David Aguilar
2016-10-11mergetool: honor diff.orderFileDavid Aguilar
2016-07-06t7610: test for mktemp before test executionArmin Kunaschik
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsDavid Aguilar
2016-03-10mergetool: support delete/delete conflictsDavid Aguilar
2015-09-08t7610: don't use test_config in a subshellJohn Keeping
2014-10-21Merge branch 'da/mergetool-temporary-directory'Junio C Hamano
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempDavid Aguilar
2014-10-16t7610-mergetool: use test_config to isolate testsDavid Aguilar
2014-10-15t7610-mergetool: prefer test_config over git configDavid Aguilar
2014-10-15t7610-mergetool: add missing && and remove commented-out codeDavid Aguilar
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesDavid Aguilar
2013-08-06rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2012-10-01Merge branch 'da/mergetool-custom'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-23 10:37:45 (GMT)