summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
AgeCommit message (Expand)Author
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2009-11-30git-merge-file --ours, --theirsJunio C Hamano
2009-05-25parse-opts: prepare for OPT_FILENAMEStephen Boyd
2008-12-27merge-file: handle freopen() failureRené Scharfe
2008-10-03parse-opt: migrate builtin-merge-file.Pierre Habouzit
2008-08-31merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano
2008-08-31xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano
2008-08-31xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano
2008-03-14Merge branch 'maint'Junio C Hamano
2008-03-14merge-file: handle empty files gracefullyJohannes Schindelin
2008-02-18xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin
2007-07-15Make every builtin-*.c file #include "builtin.h"Peter Hagervall
2007-06-05git-merge-file: refuse to merge binary filesJohannes Schindelin
2006-12-22move read_mmfile() into xdiff-interfaceJohannes Schindelin
2006-12-06merge-file: support -p and -q; fix compile warningsJohannes Schindelin
2006-12-06Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin