3 Commits (6900679c2f6d937a5a6ef616869c8887690ad19d)

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