| commit | 27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 28 Apr 2013 18:53:57 +0000 (28 11:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 28 Apr 2013 18:53:57 +0000 (28 11:53 -0700) | ||
| tree | 23fc48e5923ec3c80c5de47310d11f39053cb796 | treesnapshot (tar.gz zip) |
| parent | ea573521828162b998389fbfc45d47f413b016fe | commitdiff |
| parent | ab5f42422d7e025c3151d91cc5ec0d20b9a80922 | commitdiff |
Merge branch 'jk/merge-tree-added-identically'
off-by-one fix.
* jk/merge-tree-added-identically:
merge-tree: fix typo in "both changed identically"
off-by-one fix.
* jk/merge-tree-added-identically:
merge-tree: fix typo in "both changed identically"