Mercurial > hg
diff mercurial/help/merge-tools.txt @ 22707:38e0363dcbe0
filemerge: switch the default name for internal tools from internal:x to :x
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Sun, 28 Sep 2014 17:15:28 +0200 |
parents | f1a3ae7c15df |
children | 247bb7a2c492 |
line wrap: on
line diff
--- a/mercurial/help/merge-tools.txt Sun Sep 28 17:15:25 2014 +0200 +++ b/mercurial/help/merge-tools.txt Sun Sep 28 17:15:28 2014 +0200 @@ -68,7 +68,7 @@ it will by default not be used for symlinks and binary files. 7. If the file to be merged is not binary and is not a symlink, then - ``internal:merge`` is used. + internal ``:merge`` is used. 8. The merge of the file fails and must be resolved before commit.