2 Commits (81a361be3b12f393d402c5da63191c11c18ea6a9)

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