2 Commits (b8fda70de55ba3e4ebcece8a362f1e1da5a4feee)

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