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.

18384:e389a25e7e60

    Ask whether merge was successful when the merged file shows no changes.
  ``conflicts``
    Check whether there are conflicts even though the tool reported success.
  ``prompt``
    Always prompt for merge success, regardless of success reported by tool.

``checkchanged``
  True is equivalent to ``check = changed``.
  Default: False

``checkconflicts``
  True is equivalent to ``check = conflicts``.
  Default: False

``fixeol``
  Attempt to fix up EOL changes caused by the merge tool.
  Default: False

18385:bafbfe0b450c

    Ask whether merge was successful when the merged file shows no changes.
  ``conflicts``
    Check whether there are conflicts even though the tool reported success.
  ``prompt``
    Always prompt for merge success, regardless of success reported by tool.

``fixeol``
  Attempt to fix up EOL changes caused by the merge tool.
  Default: False