| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2008-08-30 | merge.conflictstyle: choose between "merge" and "diff3 -m" styles |  Junio C Hamano | 1 | -0/+9 |
| 2008-08-30 | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano | 1 | -3/+1 |
| 2008-08-30 | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 1 | -2/+8 |
| 2008-03-14 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+2 |
| 2008-03-13 | merge-file: handle empty files gracefully |  Johannes Schindelin | 1 | -1/+2 |
| 2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 1 | -1/+1 |
| 2007-07-14 | Make every builtin-*.c file #include "builtin.h" |  Peter Hagervall | 1 | -3/+4 |
| 2007-06-04 | git-merge-file: refuse to merge binary files | Johannes Schindelin | 1 | -1/+5 |
| 2006-12-21 | move read_mmfile() into xdiff-interface | Johannes Schindelin | 1 | -18/+2 |
| 2006-12-06 | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin | 1 | -9/+16 |
| 2006-12-06 | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 1 | -0/+72 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/builtin-merge-file.c