5 Commits (ec136663c7d5a8e2ce1664ce79f2297e2e61c86f)

Author SHA1 Message Date
Jonathan Nieder 4bb0936206 merge-file --diff3: add a label for ancestor 15 years ago
Jonathan Nieder a4b5e91c49 xdl_merge(): move file1 and file2 labels to xmparam structure 15 years ago
Linus Torvalds 81b50f3ce4 Move 'builtin-*' into a 'builtin/' subdirectory 15 years ago
Junio C Hamano 00f8f97d30 xdl_merge(): introduce xmparam_t for merge specific parameters 15 years ago
Junio C Hamano 73eb40eeaa git-merge-file --ours, --theirs 15 years ago
Stephen Boyd 3778292017 parse-opts: prepare for OPT_FILENAME 16 years ago
René Scharfe 4deba8b779 merge-file: handle freopen() failure 16 years ago
Pierre Habouzit d249610792 parse-opt: migrate builtin-merge-file. 16 years ago
Junio C Hamano b541248467 merge.conflictstyle: choose between "merge" and "diff3 -m" styles 17 years ago
Junio C Hamano 83133740d9 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less 17 years ago
Junio C Hamano e0af48e496 xdiff-merge: optionally show conflicts in "diff3 -m" style 17 years ago
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