summaryrefslogtreecommitdiff
path: root/kwset.h
diff options
context:
space:
mode:
authorLibravatar Albert L. Lash, IV <alash3@bloomberg.net>2014-02-08 15:41:34 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-11 11:02:59 -0800
commit13f72a1d5faacfdfea43e2fd961cb4009206a605 (patch)
tree7ad95f4a26fe4e22caf42d1306556dfc085f2d6d /kwset.h
parentGit 1.9.0-rc3 (diff)
downloadtgif-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 'kwset.h')
0 files changed, 0 insertions, 0 deletions