473
Comment:
|
670
remove hgext. prefix
|
Deletions are marked like this. | Additions are marked like this. |
Line 1: | Line 1: |
Making a word difference using the ExtdiffExtension and GNU wdiff. | Making a word difference using the ExtdiffExtension and GNU wdiff, somehow what {{{git diff --color-words}}} does. |
Line 5: | Line 5: |
1. Download [[http://code.google.com/p/cj-overlay/source/browse/cwdiff?repo=evergreens|cwdiff]], a shell script, which colorizes wdiff output 2. Enable ExtdiffExtension |
1. Download [[http://code.google.com/p/cj-overlay/source/browse/cwdiff?repo=evergreens|cwdiff]], a shell script, which wraps wdiff to support directories and colorizes the output. 2. Enable ExtdiffExtension (in ~/.hgrc): |
Line 9: | Line 9: |
hgext.extdiff = | extdiff = |
Line 11: | Line 11: |
3.#3 Add wdiff to | 3.#3 Add wdiff command (in ~/.hgrc): |
Line 14: | Line 14: |
cmd.wdiff = wdiff | # if cwdiff is in your path, otherwise set to wherever you've installed cwdiff cmd.wdiff = cwdiff |
Making a word difference using the ExtdiffExtension and GNU wdiff, somehow what git diff --color-words does.
Steps:
Download cwdiff, a shell script, which wraps wdiff to support directories and colorizes the output.
Enable ExtdiffExtension (in ~/.hgrc):
[extensions] extdiff =
- Add wdiff command (in ~/.hgrc):
[extdiff] # if cwdiff is in your path, otherwise set to wherever you've installed cwdiff cmd.wdiff = cwdiff #add --no-color below, if you dislike colors! opts.wdiff = --diff --ab
- Run
$ hg wdiff