| Commit message (Expand) | Author | Age |
|---|
| * | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 |
| |\ |
|
| | * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 |
| * | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 |
| |/ |
|
| * | parse-opts: prepare for OPT_FILENAME | Stephen Boyd | 2009-05-25 |
| * | merge-file: handle freopen() failure | René Scharfe | 2008-12-26 |
| * | parse-opt: migrate builtin-merge-file. | Pierre Habouzit | 2008-10-02 |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano | 2008-08-30 |
| * | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano | 2008-08-30 |
| * | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 2008-08-30 |
| * | Merge branch 'maint' | Junio C Hamano | 2008-03-14 |
| |\ |
|
| | * | merge-file: handle empty files gracefully | Johannes Schindelin | 2008-03-13 |
| * | | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 2008-02-18 |
| |/ |
|
| * | Make every builtin-*.c file #include "builtin.h" | Peter Hagervall | 2007-07-14 |
| * | git-merge-file: refuse to merge binary files | Johannes Schindelin | 2007-06-04 |
| * | move read_mmfile() into xdiff-interface | Johannes Schindelin | 2006-12-21 |
| * | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin | 2006-12-06 |
| * | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 |
