summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-02-27t602[1236], t6034: modernize test formattingElijah Newren
2018-10-06t/*: fix ordering of expected/observed argumentsMatthew DeVore
2016-01-27merge-file: ensure that conflict sections match eol styleJohannes Schindelin
2016-01-27merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin
2015-02-22Merge branch 'ab/merge-file-prefix'Junio C Hamano
2015-02-11merge-file: correctly open files when in a subdirAleksander Boruch-Gruszecki
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov
2014-06-30t6023-merge-file.sh: fix and mark as broken invalid testsMax Kirillov
2011-07-19tests: cleanup binary test vector filesVitaliy Ivanov
2010-10-18merge-file: correctly find files when called in subdirThomas Rast
2010-03-21merge-file --diff3: add a label for ancestorJonathan Nieder
2010-03-20Merge branch 'bw/union-merge-refactor'Junio C Hamano
2010-03-03merge-file: add option to specify the marker sizeBert Wesarg
2010-02-25Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Johannes Sixt
2010-01-26fix portability issues with $ in double quotesStephen Boyd
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano
2009-05-25Change xdl_merge to generate output even for null mergesCharles Bailey
2009-05-25t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-08t6023-merge-file: Work around non-portable sed usageArjen Laarhoven
2008-08-31merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano
2008-07-13t/: Use "test_must_fail git" instead of "! git"Stephan Beyer
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin
2008-02-02Sane use of test_expect_failureJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-09Merge branch 'js/merge'Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-06-05git-merge-file: refuse to merge binary filesJohannes Schindelin
2007-04-16Fix permissions on test scriptsAlex Riesen
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2007-01-16Replace "echo -n" with printf in shell scripts.Jason Riedy
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin