summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
AgeCommit message (Expand)AuthorFilesLines
2021-01-15Merge branch 'pb/mergetool-tool-help-fix'Libravatar Junio C Hamano1-0/+11
2021-01-06mergetool--lib: fix '--tool-help' to correctly show available toolsLibravatar Philippe Blain1-0/+11
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren1-3/+29
2019-06-12t7610-mergetool: use test_cmp instead of test $(cat file) = $txtLibravatar Johannes Sixt1-45/+90
2019-06-10t7610-mergetool: do not place pipelines headed by `yes` in subshellsLibravatar Johannes Sixt1-85/+85
2019-05-13mergetool: fallback to tool when guitool unavailableLibravatar Denton Liu1-0/+19
2019-04-25t7610: add mergetool --gui testsLibravatar Denton Liu1-0/+22
2019-04-25t7610: unsuppress outputLibravatar Denton Liu1-61/+61
2018-08-27Merge branch 'sg/test-must-be-empty'Libravatar Junio C Hamano1-2/+1
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'Libravatar SZEDER Gábor1-2/+1
2018-08-20Merge branch 'ab/test-must-be-empty-for-master'Libravatar Junio C Hamano1-2/+1
2018-07-30tests: make use of the test_must_be_empty functionLibravatar Ævar Arnfjörð Bjarmason1-2/+1
2018-07-03t: use test_write_lines() instead of series of 'echo' commandsLibravatar Eric Sunshine1-4/+4
2017-10-07tests: fix diff order arguments in test_cmpLibravatar Stefan Beller1-2/+2
2017-01-18Merge branch 'rh/mergetool-regression-fix'Libravatar Junio C Hamano1-114/+165
2017-01-18Merge branch 'pb/test-must-fail-is-for-git'Libravatar Junio C Hamano1-1/+1
2017-01-10mergetool: fix running in subdir when rerere enabledLibravatar Richard Hansen1-1/+6
2017-01-10t7610: add test case for rerere+mergetool+subdir bugLibravatar Richard Hansen1-1/+20
2017-01-10t7610: spell 'git reset --hard' consistentlyLibravatar Richard Hansen1-18/+19
2017-01-10t7610: don't assume the checked-out commitLibravatar Richard Hansen1-6/+6
2017-01-10t7610: always work on a test-specific branchLibravatar Richard Hansen1-2/+8
2017-01-10t7610: delete some now-unnecessary 'git reset --hard' linesLibravatar Richard Hansen1-2/+0
2017-01-10t7610: run 'git reset --hard' after each test to clean upLibravatar Richard Hansen1-0/+8
2017-01-10t7610: don't rely on state from previous testLibravatar Richard Hansen1-0/+6
2017-01-10t7610: use test_when_finished for cleanup tasksLibravatar Richard Hansen1-34/+37
2017-01-10t7610: move setup code to the 'setup' test caseLibravatar Richard Hansen1-30/+35
2017-01-10t7610: update branch names to match test numberLibravatar Richard Hansen1-41/+41
2017-01-07don't use test_must_fail with grepLibravatar Pranit Bauva1-1/+1
2016-12-16Merge branch 'ak/lazy-prereq-mktemp'Libravatar Junio C Hamano1-1/+2
2016-11-29t7610: clean up foo.XXXXXX tmpdirLibravatar Jeff King1-1/+2
2016-10-11mergetool: honor -O<orderfile>Libravatar David Aguilar1-0/+27
2016-10-11mergetool: honor diff.orderFileLibravatar David Aguilar1-0/+33
2016-07-06t7610: test for mktemp before test executionLibravatar Armin Kunaschik1-1/+6
2016-03-10mergetool: honor tempfile configuration when resolving delete conflictsLibravatar David Aguilar1-0/+25
2016-03-10mergetool: support delete/delete conflictsLibravatar David Aguilar1-0/+39
2015-09-08t7610: don't use test_config in a subshellLibravatar John Keeping1-1/+1
2014-10-21Merge branch 'da/mergetool-temporary-directory'Libravatar Junio C Hamano1-0/+23
2014-10-16t7610-mergetool: add test cases for mergetool.writeToTempLibravatar David Aguilar1-0/+23
2014-10-16t7610-mergetool: use test_config to isolate testsLibravatar David Aguilar1-5/+3
2014-10-15t7610-mergetool: prefer test_config over git configLibravatar David Aguilar1-11/+9
2014-10-15t7610-mergetool: add missing && and remove commented-out codeLibravatar David Aguilar1-8/+2
2014-10-15t7610-mergetool: use tabs instead of a mix of tabs and spacesLibravatar David Aguilar1-459/+459
2013-08-06rm: delete .gitmodules entry of submodules removed from the work treeLibravatar Jens Lehmann1-3/+3
2013-04-12Correct common spelling mistakes in comments and testsLibravatar Stefano Lattarini1-1/+1
2012-10-01Merge branch 'da/mergetool-custom'Libravatar Junio C Hamano1-0/+13
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-0/+13
2012-08-17stash: invoke rerere in case of conflictLibravatar Phil Hord1-1/+1
2012-08-17test: git-stash conflict sets up rerereLibravatar Phil Hord1-0/+38
2012-01-23mergetool: Provide an empty file when neededLibravatar David Aguilar1-1/+27
2011-09-26mergetool: Use args as pathspec to unmerged filesLibravatar Jonathon Mah1-18/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 18:34:50 +0000