Merge branch 'ns/merge-recursive-uptodate'
* ns/merge-recursive-uptodate: merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency
Junio C Hamano committed
Jul 15, 2010 at 12:08 UTC
a8b7fcffddc6bce0875775154d6a41a528340d71
No changes.