8 Commits (1b9a9467f8b9a8da2fe58d10ae16779492aa7737)

Author SHA1 Message Date
Johannes Schindelin 381b851c9b merge-file: handle empty files gracefully 17 years ago
Johannes Schindelin ee95ec5d58 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM 17 years ago
Peter Hagervall baffc0e770 Make every builtin-*.c file #include "builtin.h" 18 years ago
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 18 years ago
Johannes Schindelin ba1f5f3537 Add builtin merge-file, a minimal replacement for RCS merge 18 years ago