From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jul 2010 19:08:11 +0000 (-0700)
Subject: Merge branch 'ns/merge-recursive-uptodate'
X-Git-Tag: v1.7.2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8b7fcffddc6bce0875775154d6a41a528340d71;p=thirdparty%2Fgit.git

Merge branch 'ns/merge-recursive-uptodate'

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

a8b7fcffddc6bce0875775154d6a41a528340d71