Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t7610-mergetool.sh
Age
Commit message (
Expand
)
Author
2023-04-06
mergetool: new config guiDefault supports auto-toggling gui by DISPLAY
Tao Klerks
2022-11-16
t7610: use "file:///dev/null", not "/dev/null", fixes MinGW
Ævar Arnfjörð Bjarmason
2022-11-10
t7610: fix flaky timeout issue, don't clone from example.com
Ævar Arnfjörð Bjarmason
2021-02-18
Merge branch 'sh/mergetool-hideresolved'
Junio C Hamano
2021-02-10
mergetool: add hideResolved configuration
Seth House
2021-01-26
Merge branch 'js/default-branch-name-tests-final-stretch'
Junio C Hamano
2021-01-16
Merge branch 'pb/mergetool-tool-help-fix'
Junio C Hamano
2021-01-07
mergetool--lib: fix '--tool-help' to correctly show available tools
Philippe Blain
2020-11-20
t7[5-9]*: adjust the references to the default branch name "main"
Johannes Schindelin
2020-11-20
tests: mark tests relying on the current default for `init.defaultBranch`
Johannes Schindelin
2020-10-26
merge tests: expect improved directory/file conflict handling in ort
Elijah Newren
2019-06-12
t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
Johannes Sixt
2019-06-10
t7610-mergetool: do not place pipelines headed by `yes` in subshells
Johannes Sixt
2019-05-13
mergetool: fallback to tool when guitool unavailable
Denton Liu
2019-04-25
t7610: add mergetool --gui tests
Denton Liu
2019-04-25
t7610: unsuppress output
Denton Liu
2018-08-28
Merge branch 'sg/test-must-be-empty'
Junio C Hamano
2018-08-21
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
SZEDER Gábor
2018-08-20
Merge branch 'ab/test-must-be-empty-for-master'
Junio C Hamano
2018-07-30
tests: make use of the test_must_be_empty function
Ævar Arnfjörð Bjarmason
2018-07-03
t: use test_write_lines() instead of series of 'echo' commands
Eric Sunshine
2017-10-07
tests: fix diff order arguments in test_cmp
Stefan Beller
2017-01-19
Merge branch 'rh/mergetool-regression-fix'
Junio C Hamano
2017-01-19
Merge branch 'pb/test-must-fail-is-for-git'
Junio C Hamano
2017-01-11
mergetool: fix running in subdir when rerere enabled
Richard Hansen
2017-01-11
t7610: add test case for rerere+mergetool+subdir bug
Richard Hansen
2017-01-11
t7610: spell 'git reset --hard' consistently
Richard Hansen
2017-01-11
t7610: don't assume the checked-out commit
Richard Hansen
2017-01-11
t7610: always work on a test-specific branch
Richard Hansen
2017-01-11
t7610: delete some now-unnecessary 'git reset --hard' lines
Richard Hansen
2017-01-11
t7610: run 'git reset --hard' after each test to clean up
Richard Hansen
2017-01-11
t7610: don't rely on state from previous test
Richard Hansen
2017-01-11
t7610: use test_when_finished for cleanup tasks
Richard Hansen
2017-01-11
t7610: move setup code to the 'setup' test case
Richard Hansen
2017-01-11
t7610: update branch names to match test number
Richard Hansen
2017-01-08
don't use test_must_fail with grep
Pranit Bauva
2016-12-17
Merge branch 'ak/lazy-prereq-mktemp'
Junio C Hamano
2016-11-29
t7610: clean up foo.XXXXXX tmpdir
Jeff King
2016-10-11
mergetool: honor -O<orderfile>
David Aguilar
2016-10-11
mergetool: honor diff.orderFile
David Aguilar
2016-07-06
t7610: test for mktemp before test execution
Armin Kunaschik
2016-03-11
mergetool: honor tempfile configuration when resolving delete conflicts
David Aguilar
2016-03-11
mergetool: support delete/delete conflicts
David Aguilar
2015-09-08
t7610: don't use test_config in a subshell
John Keeping
2014-10-22
Merge branch 'da/mergetool-temporary-directory'
Junio C Hamano
2014-10-16
t7610-mergetool: add test cases for mergetool.writeToTemp
David Aguilar
2014-10-16
t7610-mergetool: use test_config to isolate tests
David Aguilar
2014-10-16
t7610-mergetool: prefer test_config over git config
David Aguilar
2014-10-16
t7610-mergetool: add missing && and remove commented-out code
David Aguilar
2014-10-16
t7610-mergetool: use tabs instead of a mix of tabs and spaces
David Aguilar
[next]