Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin | 2007-03-04 | 1 | -4/+4 |
* | Replace "echo -n" with printf in shell scripts. | Jason Riedy | 2007-01-15 | 1 | -1/+1 |
* | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 2006-12-28 | 1 | -0/+22 |
* | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 | 1 | -0/+116 |