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
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
2013-08-07
rm: delete .gitmodules entry of submodules removed from the work tree
Jens Lehmann
2013-04-13
Correct common spelling mistakes in comments and tests
Stefano Lattarini
2012-10-01
Merge branch 'da/mergetool-custom'
Junio C Hamano
2012-09-25
mergetool--lib: Allow custom commands to override built-ins
David Aguilar
2012-08-17
stash: invoke rerere in case of conflict
Phil Hord
2012-08-17
test: git-stash conflict sets up rerere
Phil Hord
2012-01-23
mergetool: Provide an empty file when needed
David Aguilar
2011-09-26
mergetool: Use args as pathspec to unmerged files
Jonathon Mah
2011-04-13
mergetool: Teach about submodules
Jonathon Mah
2011-02-17
mergetool: don't skip modify/remove conflicts
Martin von Zweigbergk
2010-11-09
tests: add missing &&
Jonathan Nieder
2010-08-24
t7610: cd inside subshell instead of around
Brian Gernhardt
2010-08-18
mergetool: Skip autoresolved paths
David Aguilar
2009-01-31
mergetool: fix running mergetool in sub-directories
Charles Bailey
2009-01-31
mergetool: Add a test for running mergetool in a sub-directory
Charles Bailey
2009-01-27
mergetool: respect autocrlf by using checkout-index
Charles Bailey
2008-09-04
tests: use "git xyzzy" form (t7200 - t9001)
Nanako Shiraishi
2008-07-14
t/: Use "test_must_fail git" instead of "! git"
Stephan Beyer
2008-07-04
Fix executable bits in t/ scripts
Junio C Hamano
2008-03-05
Add a very basic test script for git mergetool
Charles Bailey