| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2007-02-27 | convert object type handling from a string to a number |  Nicolas Pitre | 1 | -5/+5 |
| 2006-12-12 | Get rid of the dependency on RCS' merge program |  Johannes Schindelin | 1 | -62/+13 |
| 2006-09-02 | Replace uses of strdup with xstrdup. |  Shawn Pearce | 1 | -1/+1 |
| 2006-06-28 | Improved three-way blob merging code |  Linus Torvalds | 1 | -0/+166 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/merge-file.c