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
2020-02-27
t602[1236], t6034: modernize test formatting
Elijah Newren
2018-10-07
t/*: fix ordering of expected/observed arguments
Matthew DeVore
2016-01-27
merge-file: ensure that conflict sections match eol style
Johannes Schindelin
2016-01-27
merge-file: let conflict markers match end-of-line style of the context
Johannes Schindelin
2015-02-22
Merge branch 'ab/merge-file-prefix'
Junio C Hamano
2015-02-11
merge-file: correctly open files when in a subdir
Aleksander Boruch-Gruszecki
2014-07-01
git-merge-file: do not add LF at EOF while applying unrelated change
Max Kirillov
2014-07-01
t6023-merge-file.sh: fix and mark as broken invalid tests
Max Kirillov
2011-07-19
tests: cleanup binary test vector files
Vitaliy Ivanov
2010-10-19
merge-file: correctly find files when called in subdir
Thomas Rast
2010-03-21
merge-file --diff3: add a label for ancestor
Jonathan Nieder
2010-03-20
Merge branch 'bw/union-merge-refactor'
Junio C Hamano
2010-03-03
merge-file: add option to specify the marker size
Bert Wesarg
2010-02-25
Windows: redirect f[re]open("/dev/null") to f[re]open("nul")
Johannes Sixt
2010-01-27
fix portability issues with $ in double quotes
Stephen Boyd
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
Junio C Hamano
2009-05-25
Change xdl_merge to generate output even for null merges
Charles Bailey
2009-05-25
t6023: merge-file fails to output anything for a degenerate merge
Charles Bailey
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