4 Commits (d3d4fa86319a0bf97752e285907a8d34a2824951)

Author SHA1 Message Date
Johannes Schindelin 5bd74506cd Get rid of the dependency to GNU diff in the tests 18 years ago
Jason Riedy 2aad957a51 Replace "echo -n" with printf in shell scripts. 18 years ago
Johannes Schindelin 5d6b151fdd xdl_merge(): fix a segmentation fault when refining conflicts 18 years ago
Johannes Schindelin ba1f5f3537 Add builtin merge-file, a minimal replacement for RCS merge 18 years ago