Code

Merge branch 'ns/merge-recursive-uptodate'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000 (12:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Jul 2010 19:08:11 +0000 (12:08 -0700)
commita8b7fcffddc6bce0875775154d6a41a528340d71
tree7a351043d53ce60a3686cd61d035a099d0caca08
parentc257bbb559732ae2be07064de7a583bc24436667
parent5e5ffa091bc272f5034a8e3f2bf9fbb0bd79086c
Merge branch 'ns/merge-recursive-uptodate'

* ns/merge-recursive-uptodate:
  merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency