aboutsummaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
Commit message (Expand)AuthorAge
* merge-file --diff3: add a label for ancestorJonathan Nieder2010-03-20
* Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-20
|\
| * merge-file: add option to specify the marker sizeBert Wesarg2010-03-02
* | Windows: redirect f[re]open("/dev/null") to f[re]open("nul")Johannes Sixt2010-02-25
|/
* fix portability issues with $ in double quotesStephen Boyd2010-01-26
* Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-02
|\
| * Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-24
| * t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey2009-05-24
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| * | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
| |/
* | t6023-merge-file: Work around non-portable sed usageArjen Laarhoven2008-09-08
* | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-17
|/
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-13
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-18
* xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-18
* Sane use of test_expect_failureJunio C Hamano2008-02-01
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Merge branch 'js/merge'Junio C Hamano2007-06-09
|\
| * git-merge-file: refuse to merge binary filesJohannes Schindelin2007-06-04
* | War on whitespaceJunio C Hamano2007-06-07
|/
* Fix permissions on test scriptsAlex Riesen2007-04-16
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-04
* Replace "echo -n" with printf in shell scripts.Jason Riedy2007-01-15
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-28
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-06