Merge branch 'jc/bottomless' into next
[gitweb.git] / Documentation / git-merge-tree.txt
2006-04-13 Documentation: add a couple of missing docs.