3 Commits (b722b9585518c9d75ec5d8731cb90dc0c9fb918c)

Author SHA1 Message Date
Johannes Schindelin 7cab5883ff move read_mmfile() into xdiff-interface 18 years ago
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