summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
AgeCommit message (Expand)AuthorFilesLines
2010-03-20merge-file --diff3: add a label for ancestorLibravatar Jonathan Nieder1-2/+2
2010-03-20Merge branch 'bw/union-merge-refactor'Libravatar Junio C Hamano1-0/+37
2010-03-02merge-file: add option to specify the marker sizeLibravatar Bert Wesarg1-0/+37
2010-02-25Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Libravatar Johannes Sixt1-0/+4
2010-01-26fix portability issues with $ in double quotesLibravatar Stephen Boyd1-2/+2
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintLibravatar Junio C Hamano1-0/+6
2009-05-24Change xdl_merge to generate output even for null mergesLibravatar Charles Bailey1-1/+1
2009-05-24t6023: merge-file fails to output anything for a degenerate mergeLibravatar Charles Bailey1-0/+6
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-0/+44
2008-09-08t6023-merge-file: Work around non-portable sed usageLibravatar Arjen Laarhoven1-2/+2
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-1/+8
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano1-0/+37
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryLibravatar Junio C Hamano1-1/+1
2008-07-13t/: Use "test_must_fail git" instead of "! git"Libravatar Stephan Beyer1-6/+8
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano1-4/+4
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMLibravatar Johannes Schindelin1-0/+10
2008-02-18xdl_merge(): make XDL_MERGE_ZEALOUS output simplerLibravatar Johannes Schindelin1-0/+10
2008-02-01Sane use of test_expect_failureLibravatar Junio C Hamano1-6/+6
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-5/+5
2007-06-09Merge branch 'js/merge'Libravatar Junio C Hamano1-0/+5
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-06-04git-merge-file: refuse to merge binary filesLibravatar Johannes Schindelin1-0/+5
2007-04-16Fix permissions on test scriptsLibravatar Alex Riesen1-0/+0
2007-03-04Get rid of the dependency to GNU diff in the testsLibravatar Johannes Schindelin1-4/+4
2007-01-15Replace "echo -n" with printf in shell scripts.Libravatar Jason Riedy1-1/+1
2006-12-28xdl_merge(): fix a segmentation fault when refining conflictsLibravatar Johannes Schindelin1-0/+22
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+116
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 10:49:08 +0000