| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'maint' | Junio C Hamano | 2008-03-14 | 1 | -1/+2 |
| |\ | |||||
| | * | merge-file: handle empty files gracefully | Johannes Schindelin | 2008-03-13 | 1 | -1/+2 |
| * | | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 2008-02-18 | 1 | -1/+1 |
| |/ | |||||
| * | Make every builtin-*.c file #include "builtin.h" | Peter Hagervall | 2007-07-14 | 1 | -3/+4 |
| * | git-merge-file: refuse to merge binary files | Johannes Schindelin | 2007-06-04 | 1 | -1/+5 |
| * | move read_mmfile() into xdiff-interface | Johannes Schindelin | 2006-12-21 | 1 | -18/+2 |
| * | merge-file: support -p and -q; fix compile warnings | Johannes Schindelin | 2006-12-06 | 1 | -9/+16 |
| * | Add builtin merge-file, a minimal replacement for RCS merge | Johannes Schindelin | 2006-12-06 | 1 | -0/+72 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/builtin-merge-file.c