summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-2/+2
|\
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-2/+2
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-291-5/+10
|/
* parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-251-1/+1
* merge-file: handle freopen() failureRené Scharfe2008-12-261-2/+5
* parse-opt: migrate builtin-merge-file.Pierre Habouzit2008-10-021-31/+37
* merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+9
* xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-301-3/+1
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-301-2/+8
* Merge branch 'maint'Junio C Hamano2008-03-141-1/+2
|\
| * merge-file: handle empty files gracefullyJohannes Schindelin2008-03-131-1/+2
* | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-181-1/+1
|/
* Make every builtin-*.c file #include "builtin.h"Peter Hagervall2007-07-141-3/+4
* git-merge-file: refuse to merge binary filesJohannes Schindelin2007-06-041-1/+5
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-211-18/+2
* merge-file: support -p and -q; fix compile warningsJohannes Schindelin2006-12-061-9/+16
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-061-0/+72
View Lorry Controller Status