Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
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 |