# Non english user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # add new command called vimdiff, runs gvimdiff with DirDiff plugin # add new command called meld, runs meld (no need to name twice) # add new command called vdiff, runs kdiff3 # similarly, a command that runs GNU diff(1) in 'side-by-side' mode # add new command that runs GNU diff(1) in 'context diff' mode The extdiff extension also allows users to configure new diff commands in the hgrc files, so you do not need to type hg extdiff -p kdiff3 always. The extdiff extension makes snapshots of only needed files, so running the external diff program will actually be pretty fast (at least faster than having to compare the entire tree). You may also use -rev/-r and -I/-X options, as well as the list of file or directory names like normal hg diff command. You may use the -o option to specify options to the external diff utility: Please note that the external diff utility of your choice must be able to compare directories. Or, use the -p option specify an external diff utility for comparing files: Making snapshot of 1 files from working dirĭiff -Npru crew.dfe87137ed14/mercurial/localrepo.py crew/mercurial/localrepo.py Making snapshot of 1 files from rev dfe87137ed14 You can run extdiff with default settings ( diff -Npru): Show differences between revisions for the specified files, usingĪn external program. Use external program to diff repository (or selected files) Then, the extdiff command should be available: The external diff programs are called with a configurable set of options and two non-option arguments: paths to directories containing snapshots of files to compare, or paths to the files themselves if only one file is modified. The extdiff Mercurial extension allows you to use external programs to compare revisions, or revision with working dir. This extension is currently being distributed along with Mercurial.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |