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
/
t6024-recursive-merge.sh
Age
Commit message (
Expand
)
Author
2009-07-02
Remove filename from conflict markers
Martin Renold
2008-12-25
merge-recursive: mark rename/delete conflict as unmerged
Johannes Schindelin
2008-07-14
t/: Use "test_must_fail git" instead of "! git"
Stephan Beyer
2008-05-24
tests: do not use implicit "git diff --no-index"
Junio C Hamano
2008-03-01
t6024: move "git reset" to prepare for a test inside the test itself
Junio C Hamano
2008-02-02
Sane use of test_expect_failure
Junio C Hamano
2007-07-03
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2007-06-05
merge-recursive: refuse to merge binary files
Johannes Schindelin
2007-04-17
Fix permissions on test scripts
Alex Riesen
2007-03-04
Get rid of the dependency to GNU diff in the tests
Johannes Schindelin
2006-12-28
t6024-recursive-merge: quiet down this test
Eric Wong
2006-12-23
Display 'theirs' branch name when possible in merge.
Shawn O. Pearce
2006-12-13
merge-recursive: add/add really is modify/modify with an empty base
Johannes Schindelin
2006-12-13
add test case for recursive merge
Junio C Hamano