Mercurial > hg
diff mercurial/help/config.txt @ 26225:e257df7a9974
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 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Thu Sep 10 09:41:11 2015 -0400 +++ b/mercurial/help/config.txt Thu Sep 10 13:45:00 2015 -0400 @@ -1037,7 +1037,7 @@ This tool can merge symlinks. (default: False) ``check`` - A list of merge success-checking options:: + A list of merge success-checking options: ``changed`` Ask whether merge was successful when the merged file shows no changes.