Mercurial > hg

comparison mercurial/help/config.txt @ 26225:e257df7a9974

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help/config: back out 5f2a1ebd6e78 This breaks building manpages, and by association breaks building debs. timeless has a fix coming, but it turns out we'll need to back out 5f2a1ebd6e78 anyway, so just back it out now to fix building packages.
author Augie Fackler <augie@google.com>
date Thu, 10 Sep 2015 13:45:00 -0400
parents 6832ba528d1a
children bf2bfc6f45fb
comparison
equal deleted inserted replaced
26224:a4da463df6cf 26225:e257df7a9974
1035 1035
1036 ``symlink`` 1036 ``symlink``
1037 This tool can merge symlinks. (default: False) 1037 This tool can merge symlinks. (default: False)
1038 1038
1039 ``check`` 1039 ``check``
1040 A list of merge success-checking options:: 1040 A list of merge success-checking options:
1041 1041
1042 ``changed`` 1042 ``changed``
1043 Ask whether merge was successful when the merged file shows no changes. 1043 Ask whether merge was successful when the merged file shows no changes.
1044 ``conflicts`` 1044 ``conflicts``
1045 Check whether there are conflicts even though the tool reported success. 1045 Check whether there are conflicts even though the tool reported success.