From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Aug 2008 21:29:37 +0000 (-0700)
Subject: Merge branch 'mv/maint-merge-fix' into maint
X-Git-Tag: v1.6.0.1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=97e5f4908dd22c99e825ccb254f05a61fda8d19c;p=git.git

Merge branch 'mv/maint-merge-fix' into maint

* mv/maint-merge-fix:
  merge: fix numerus bugs around "trivial merge" area
---

97e5f4908dd22c99e825ccb254f05a61fda8d19c