diff options
| author |  Albert L. Lash, IV <alash3@bloomberg.net> | 2014-02-08 15:41:34 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-11 11:02:59 -0800 |
| commit | 13f72a1d5faacfdfea43e2fd961cb4009206a605 (patch) | |
| tree | 7ad95f4a26fe4e22caf42d1306556dfc085f2d6d /git-gui/windows/git-gui.sh | |
| parent | Git 1.9.0-rc3 (diff) | |
| download | tgif-13f72a1d5faacfdfea43e2fd961cb4009206a605.tar.xz | |
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>
Diffstat (limited to 'git-gui/windows/git-gui.sh')
0 files changed, 0 insertions, 0 deletions