aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
Commit message (Expand)AuthorAge
* builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina2010-09-03
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22