Merge branch 'jc/fix5500'
[git.git] / Documentation / git-merge-tree.txt
2006-04-13 Junio C HamanoDocumentation: add a couple of missing docs.