summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-021-0/+6
|\
| * Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-241-1/+1
| * t6023: merge-file fails to output anything for a degenerate mergeCharles Bailey2009-05-241-0/+6
* | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+44
|\ \
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-1/+8
| * | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-301-0/+37
| |/
* | t6023-merge-file: Work around non-portable sed usageArjen Laarhoven2008-09-081-2/+2
* | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-171-1/+1
|/
* t/: Use "test_must_fail git" instead of "! git"Stephan Beyer2008-07-131-6/+8
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-4/+4
* xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-181-0/+10
* xdl_merge(): make XDL_MERGE_ZEALOUS output simplerJohannes Schindelin2008-02-181-0/+10
* Sane use of test_expect_failureJunio C Hamano2008-02-011-6/+6
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-5/+5
* Merge branch 'js/merge'Junio C Hamano2007-06-091-0/+5
|\
| * git-merge-file: refuse to merge binary filesJohannes Schindelin2007-06-041-0/+5
* | War on whitespaceJunio C Hamano2007-06-071-1/+0
|/
* Fix permissions on test scriptsAlex Riesen2007-04-161-0/+0
* Get rid of the dependency to GNU diff in the testsJohannes Schindelin2007-03-041-4/+4
* Replace "echo -n" with printf in shell scripts.Jason Riedy2007-01-151-1/+1
* xdl_merge(): fix a segmentation fault when refining conflictsJohannes Schindelin2006-12-281-0/+22
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+116
View Lorry Controller Status