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
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