Mercurial > hg
comparison mercurial/help/config.txt @ 18385:bafbfe0b450c
docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration
These settings were replaced by check=changed and check=conflicts in
a912f26777d3. There is no reason to announce two different ways to achieve the
same. The old way should be kept but not announced.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 15 Jan 2013 23:30:10 +0100 |
parents | 8243dd66e0e3 |
children | 68eecbaf1bd3 |
comparison
equal
deleted
inserted
replaced
18384:e389a25e7e60 | 18385:bafbfe0b450c |
---|---|
847 Ask whether merge was successful when the merged file shows no changes. | 847 Ask whether merge was successful when the merged file shows no changes. |
848 ``conflicts`` | 848 ``conflicts`` |
849 Check whether there are conflicts even though the tool reported success. | 849 Check whether there are conflicts even though the tool reported success. |
850 ``prompt`` | 850 ``prompt`` |
851 Always prompt for merge success, regardless of success reported by tool. | 851 Always prompt for merge success, regardless of success reported by tool. |
852 | |
853 ``checkchanged`` | |
854 True is equivalent to ``check = changed``. | |
855 Default: False | |
856 | |
857 ``checkconflicts`` | |
858 True is equivalent to ``check = conflicts``. | |
859 Default: False | |
860 | 852 |
861 ``fixeol`` | 853 ``fixeol`` |
862 Attempt to fix up EOL changes caused by the merge tool. | 854 Attempt to fix up EOL changes caused by the merge tool. |
863 Default: False | 855 Default: False |
864 | 856 |