##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

help: fix typo in merge-tools topic
Wagner Bruna -
r12858:6eec9d7c stable
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -31,7 +31,7 b' able to handle the merge if it can handl'
31 symlink, if it can handle binary files if the file is binary, and if a
31 symlink, if it can handle binary files if the file is binary, and if a
32 GUI is available if the tool requires a GUI.
32 GUI is available if the tool requires a GUI.
33
33
34 There are a some internal merge tools which can be used. The internal
34 There are some internal merge tools which can be used. The internal
35 merge tools are:
35 merge tools are:
36
36
37 ``internal:merge``
37 ``internal:merge``
General Comments 0
You need to be logged in to leave comments. Login now