aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
Commit message (Expand)AuthorAge
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
* Build in mergeMiklos Vajna2008-07-07