# HG changeset patch # User Kyle Lippincott # Date 1522437406 25200 # Node ID 2208149c4b8e793eada6426ed6be82c03afc3e7d # Parent b9dd8403d8ff4b36847ce405c0db127ca64491a1 extdiff: document that it copies modified files back to working directory Differential Revision: https://phab.mercurial-scm.org/D2976 diff -r b9dd8403d8ff -r 2208149c4b8e hgext/extdiff.py --- a/hgext/extdiff.py Fri Mar 30 13:39:06 2018 -0700 +++ b/hgext/extdiff.py Fri Mar 30 12:16:46 2018 -0700 @@ -13,6 +13,11 @@ non-option arguments: paths to directories containing snapshots of files to compare. +If there is more than one file being compared and the "child" revision +is the working directory, any modifications made in the external diff +program will be copied back to the working directory from the temporary +directory. + The extdiff extension also allows you to configure new diff commands, so you do not need to type :hg:`extdiff -p kdiff3` always. :: diff -r b9dd8403d8ff -r 2208149c4b8e tests/test-extension.t --- a/tests/test-extension.t Fri Mar 30 13:39:06 2018 -0700 +++ b/tests/test-extension.t Fri Mar 30 12:16:46 2018 -0700 @@ -730,6 +730,10 @@ called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare. + If there is more than one file being compared and the "child" revision is the + working directory, any modifications made in the external diff program will be + copied back to the working directory from the temporary directory. + The extdiff extension also allows you to configure new diff commands, so you do not need to type 'hg extdiff -p kdiff3' always.