4 Commits (90c88a698e8bf36ff5812a177f8b6c2f878f229c)

Author SHA1 Message Date
Johannes Schindelin 5771907a57 git-merge-file: refuse to merge binary files 18 years ago
Johannes Schindelin 7cab5883ff move read_mmfile() into xdiff-interface 18 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