]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c257bbb 5e5ffa0)
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)
* ns/merge-recursive-uptodate:
  merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.