| commit | 13f72a1d5faacfdfea43e2fd961cb4009206a605 | |
| author | Albert L. Lash, IV <alash3@bloomberg.net> | |
| Sat, 8 Feb 2014 20:41:34 +0000 (8 15:41 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Feb 2014 19:02:59 +0000 (11 11:02 -0800) | ||
| tree | 7ad95f4a26fe4e22caf42d1306556dfc085f2d6d | treesnapshot (tar.gz zip) |
| parent | 6a7071958620dadcce84e4faaa470407ae3d4108 | commitdiff |
docs/merge-strategies: remove hyphen from mis-merges
The term mismerges without hyphen is used a few other
places in the documentation. Let's update this to
be consistent.
Signed-off-by: Albert L. Lash, IV <alash3@bloomberg.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The term mismerges without hyphen is used a few other
places in the documentation. Let's update this to
be consistent.
Signed-off-by: Albert L. Lash, IV <alash3@bloomberg.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-strategies.txt | diffblobblamehistory |