From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Apr 2013 18:53:57 +0000 (-0700)
Subject: Merge branch 'jk/merge-tree-added-identically'
X-Git-Tag: v1.8.3-rc1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c;p=git

Merge branch 'jk/merge-tree-added-identically'

off-by-one fix.

* jk/merge-tree-added-identically:
  merge-tree: fix typo in "both changed identically"
---

27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c