Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: document that it copies modified files back to working directory
authorKyle Lippincott <spectral@google.com>
Fri, 30 Mar 2018 12:16:46 -0700
changeset 37209 2208149c4b8e
parent 37208 b9dd8403d8ff
child 37210 2a2ce93e12f4
extdiff: document that it copies modified files back to working directory Differential Revision: https://phab.mercurial-scm.org/D2976
hgext/extdiff.py file | annotate | diff | comparison | revisions
tests/test-extension.t file | annotate | diff | comparison | revisions 
--- 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. ::
 
--- 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.
mercurial