aboutsummaryrefslogtreecommitdiff
path: root/merge-index.c
Commit message (Expand)AuthorAge
* Big tool rename.Junio C Hamano2005-09-07