Age | Commit message (Expand) | Author |
---|---|---|
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin |
2008-02-18 | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin |
2008-02-02 | Sane use of test_expect_failure | Junio C Hamano |
2007-07-03 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano |
2007-06-09 | Merge branch 'js/merge' | Junio C Hamano |
2007-06-07 | War on whitespace | Junio C Hamano |
2007-06-05 | git-merge-file: refuse to merge binary files | Johannes Schindelin |
2007-04-17 | Fix permissions on test scripts | Alex Riesen |
2007-03-04 | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin |
2007-01-16 | Replace "echo -n" with printf in shell scripts. | Jason Riedy |
2006-12-29 | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin |
2006-12-06 | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin |