aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
|/
* parse-opts: prepare for OPT_FILENAMEStephen Boyd2009-05-25
* merge-file: handle freopen() failureRené Scharfe2008-12-26
* parse-opt: migrate builtin-merge-file.Pierre Habouzit2008-10-02
* merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
* xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
* xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
* Merge branch 'maint'Junio C Hamano2008-03-14
|\
| * merge-file: handle empty files gracefullyJohannes Schindelin2008-03-13
* | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUMJohannes Schindelin2008-02-18
|/
* Make every builtin-*.c file #include "builtin.h"Peter Hagervall2007-07-14
* git-merge-file: refuse to merge binary filesJohannes Schindelin2007-06-04
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-21
* merge-file: support -p and -q; fix compile warningsJohannes Schindelin2006-12-06
* Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin2006-12-06
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 01:41:42 +0000