equal
deleted
inserted
replaced
728 The extdiff Mercurial extension allows you to use external programs to compare |
728 The extdiff Mercurial extension allows you to use external programs to compare |
729 revisions, or revision with working directory. The external diff programs are |
729 revisions, or revision with working directory. The external diff programs are |
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 |
736 [extdiff] |
740 [extdiff] |
737 # add new command that runs GNU diff(1) in 'context diff' mode |
741 # add new command that runs GNU diff(1) in 'context diff' mode |