summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
AgeCommit message (Expand)AuthorFilesLines
2010-01-20Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-2/+2
2010-01-16xdl_merge(): introduce xmparam_t for merge specific parametersLibravatar Junio C Hamano1-2/+2
2009-11-29git-merge-file --ours, --theirsLibravatar Junio C Hamano1-5/+10
2009-05-25parse-opts: prepare for OPT_FILENAMELibravatar Stephen Boyd1-1/+1
2008-12-26merge-file: handle freopen() failureLibravatar René Scharfe1-2/+5
2008-10-02parse-opt: migrate builtin-merge-file.Libravatar Pierre Habouzit1-31/+37
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-0/+9
2008-08-30xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessLibravatar Junio C Hamano1-3/+1
2008-08-30xdiff-merge: optionally show conflicts in "diff3 -m" styleLibravatar Junio C Hamano1-2/+8
2008-03-14Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2008-03-13merge-file: handle empty files gracefullyLibravatar Johannes Schindelin1-1/+2
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMLibravatar Johannes Schindelin1-1/+1
2007-07-14Make every builtin-*.c file #include "builtin.h"Libravatar Peter Hagervall1-3/+4
2007-06-04git-merge-file: refuse to merge binary filesLibravatar Johannes Schindelin1-1/+5
2006-12-21move read_mmfile() into xdiff-interfaceLibravatar Johannes Schindelin1-18/+2
2006-12-06merge-file: support -p and -q; fix compile warningsLibravatar Johannes Schindelin1-9/+16
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeLibravatar Johannes Schindelin1-0/+72
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:56:27 +0000