Age | Commit message (Expand) | Author | Files | Lines |
2018-10-07 | t/*: fix ordering of expected/observed arguments | Matthew DeVore | 1 | -6/+6 |
2016-01-27 | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 1 | -1/+2 |
2016-01-27 | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 1 | -0/+12 |
2015-02-22 | Merge branch 'ab/merge-file-prefix' | Junio C Hamano | 1 | -1/+2 |
2015-02-11 | merge-file: correctly open files when in a subdir | Aleksander Boruch-Gruszecki | 1 | -1/+2 |
2014-06-30 | git-merge-file: do not add LF at EOF while applying unrelated change | Max Kirillov | 1 | -0/+85 |
2014-06-30 | t6023-merge-file.sh: fix and mark as broken invalid tests | Max Kirillov | 1 | -3/+3 |
2011-07-19 | tests: cleanup binary test vector files | Vitaliy Ivanov | 1 | -1/+1 |
2010-10-18 | merge-file: correctly find files when called in subdir | Thomas Rast | 1 | -0/+8 |
2010-03-20 | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 1 | -2/+2 |
2010-03-20 | Merge branch 'bw/union-merge-refactor' | Junio C Hamano | 1 | -0/+37 |
2010-03-02 | merge-file: add option to specify the marker size | Bert Wesarg | 1 | -0/+37 |
2010-02-25 | Windows: redirect f[re]open("/dev/null") to f[re]open("nul") | Johannes Sixt | 1 | -0/+4 |
2010-01-26 | fix portability issues with $ in double quotes | Stephen Boyd | 1 | -2/+2 |
2009-06-02 | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint | Junio C Hamano | 1 | -0/+6 |
2009-05-24 | Change xdl_merge to generate output even for null merges | Charles Bailey | 1 | -1/+1 |
2009-05-24 | t6023: merge-file fails to output anything for a degenerate merge | Charles Bailey | 1 | -0/+6 |
2008-09-29 | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 1 | -0/+44 |
2008-09-08 | t6023-merge-file: Work around non-portable sed usage | Arjen Laarhoven | 1 | -2/+2 |
2008-08-30 | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano | 1 | -1/+8 |
2008-08-30 | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 1 | -0/+37 |
2008-08-17 | tests: use $TEST_DIRECTORY to refer to the t/ directory | Junio C Hamano | 1 | -1/+1 |
2008-07-13 | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 1 | -6/+8 |
2008-05-24 | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 1 | -4/+4 |
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 1 | -0/+10 |
2008-02-18 | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin | 1 | -0/+10 |
2008-02-01 | Sane use of test_expect_failure | Junio C Hamano | 1 | -6/+6 |
2007-07-02 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 1 | -5/+5 |
2007-06-09 | Merge branch 'js/merge' | Junio C Hamano | 1 | -0/+5 |
2007-06-07 | War on whitespace | Junio C Hamano | 1 | -1/+0 |
2007-06-04 | git-merge-file: refuse to merge binary files | Johannes Schindelin | 1 | -0/+5 |
2007-04-16 | Fix permissions on test scripts | Alex Riesen | 1 | -0/+0 |
2007-03-04 | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin | 1 | -4/+4 |
2007-01-15 | Replace "echo -n" with printf in shell scripts. | Jason Riedy | 1 | -1/+1 |
2006-12-28 | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 1 | -0/+22 |
2006-12-06 | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 1 | -0/+116 |