2 Commits (e697e4cd1fc492e312a396211bafc629d6297ebd)

Author SHA1 Message Date
Johannes Schindelin fbe0b24ca5 merge-file: support -p and -q; fix compile warnings 18 years ago
Johannes Schindelin ba1f5f3537 Add builtin merge-file, a minimal replacement for RCS merge 18 years ago