index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6023-merge-file.sh
Commit message (
Expand
)
Author
Age
*
merge-file: correctly open files when in a subdir
Aleksander Boruch-Gruszecki
2015-02-11
*
tests: cleanup binary test vector files
Vitaliy Ivanov
2011-07-19
*
merge-file: correctly find files when called in subdir
Thomas Rast
2010-10-18
*
merge-file --diff3: add a label for ancestor
Jonathan Nieder
2010-03-20
*
Merge branch 'bw/union-merge-refactor'
Junio C Hamano
2010-03-20
|
\
|
*
merge-file: add option to specify the marker size
Bert Wesarg
2010-03-02
*
|
Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
Johannes Sixt
2010-02-25
|
/
*
fix portability issues with $ in double quotes
Stephen Boyd
2010-01-26
*
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
Junio C Hamano
2009-06-02
|
\
|
*
Change xdl_merge to generate output even for null merges
Charles Bailey
2009-05-24
|
*
t6023: merge-file fails to output anything for a degenerate merge
Charles Bailey
2009-05-24
*
|
Merge branch 'jc/better-conflict-resolution'
Shawn O. Pearce
2008-09-29
|
\
\
|
*
|
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
Junio C Hamano
2008-08-30
|
*
|
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-08-30
|
|
/
*
|
t6023-merge-file: Work around non-portable sed usage
Arjen Laarhoven
2008-09-08
*
|
tests: use $TEST_DIRECTORY to refer to the t/ directory
Junio C Hamano
2008-08-17
|
/
*
t/: Use "test_must_fail git" instead of "! git"
Stephan Beyer
2008-07-13
*
tests: do not use implicit "git diff --no-index"
Junio C Hamano
2008-05-24
*
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2008-02-18
*
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Johannes Schindelin
2008-02-18
*
Sane use of test_expect_failure
Junio C Hamano
2008-02-01
*
Rewrite "git-frotz" to "git frotz"
Junio C Hamano
2007-07-02
*
Merge branch 'js/merge'
Junio C Hamano
2007-06-09
|
\
|
*
git-merge-file: refuse to merge binary files
Johannes Schindelin
2007-06-04
*
|
War on whitespace
Junio C Hamano
2007-06-07
|
/
*
Fix permissions on test scripts
Alex Riesen
2007-04-16
*
Get rid of the dependency to GNU diff in the tests
Johannes Schindelin
2007-03-04
*
Replace "echo -n" with printf in shell scripts.
Jason Riedy
2007-01-15
*
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-28
*
Add builtin merge-file, a minimal replacement for RCS merge
Johannes Schindelin
2006-12-06