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
/
t6023-merge-file.sh
Age
Commit message (
Expand
)
Author
2008-09-29
Merge branch 'jc/better-conflict-resolution'
Shawn O. Pearce
2008-09-09
t6023-merge-file: Work around non-portable sed usage
Arjen Laarhoven
2008-08-31
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Junio C Hamano
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-08-17
tests: use $TEST_DIRECTORY to refer to the t/ directory
Junio C Hamano
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-02-18
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2008-02-18
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Johannes Schindelin
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-09
Merge branch 'js/merge'
Junio C Hamano
2007-06-07
War on whitespace
Junio C Hamano
2007-06-05
git-merge-file: 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
2007-01-16
Replace "echo -n" with printf in shell scripts.
Jason Riedy
2006-12-29
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-06
Add builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin