| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 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