diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-28 11:53:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 11:53:57 -0700 |
| commit | 27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c (patch) | |
| tree | 23fc48e5923ec3c80c5de47310d11f39053cb796 /diffcore-pickaxe.c | |
| parent | ea573521828162b998389fbfc45d47f413b016fe (diff) | |
| parent | ab5f42422d7e025c3151d91cc5ec0d20b9a80922 (diff) | |
| download | git-27f0d3b63d5d20ebaba4cb45dddfc2e29649f18c.tar.gz | |
Merge branch 'jk/merge-tree-added-identically'
off-by-one fix.
* jk/merge-tree-added-identically:
merge-tree: fix typo in "both changed identically"
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions