##// END OF EJS Templates
extdiff: document that it copies modified files back to working directory...
Kyle Lippincott -
r37226:2208149c default
parent child Browse files
Show More
@@ -13,6 +13,11 b' diff programs are called with a configur'
13 non-option arguments: paths to directories containing snapshots of
13 non-option arguments: paths to directories containing snapshots of
14 files to compare.
14 files to compare.
15
15
16 If there is more than one file being compared and the "child" revision
17 is the working directory, any modifications made in the external diff
18 program will be copied back to the working directory from the temporary
19 directory.
20
16 The extdiff extension also allows you to configure new diff commands, so
21 The extdiff extension also allows you to configure new diff commands, so
17 you do not need to type :hg:`extdiff -p kdiff3` always. ::
22 you do not need to type :hg:`extdiff -p kdiff3` always. ::
18
23
@@ -730,6 +730,10 b' Extension module help vs command help:'
730 called with a configurable set of options and two non-option arguments: paths
730 called with a configurable set of options and two non-option arguments: paths
731 to directories containing snapshots of files to compare.
731 to directories containing snapshots of files to compare.
732
732
733 If there is more than one file being compared and the "child" revision is the
734 working directory, any modifications made in the external diff program will be
735 copied back to the working directory from the temporary directory.
736
733 The extdiff extension also allows you to configure new diff commands, so you
737 The extdiff extension also allows you to configure new diff commands, so you
734 do not need to type 'hg extdiff -p kdiff3' always.
738 do not need to type 'hg extdiff -p kdiff3' always.
735
739
General Comments 0
You need to be logged in to leave comments. Login now