| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | convert object type handling from a string to a number | Nicolas Pitre | 2007-02-27 |
| * | Get rid of the dependency on RCS' merge program | Johannes Schindelin | 2006-12-12 |
| * | Replace uses of strdup with xstrdup. | Shawn Pearce | 2006-09-02 |
| * | Improved three-way blob merging code | Linus Torvalds | 2006-06-28 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/merge-file.c