]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/merge-tree-added-identically'
authorJunio C Hamano <gitster@pobox.com>
Sun, 28 Apr 2013 18:53:57 +0000 (11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 28 Apr 2013 18:53:57 +0000 (11:53 -0700)
off-by-one fix.

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


Trivial merge