Mercurial > hg > mercurial-crew-with-dirclash
changeset 2340:61f139601224
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 23 May 2006 18:10:40 +0200 |
parents | 11422943cf72 (current diff) 391c5d0f9ef3 (diff) |
children | c6391adc356a |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -101,7 +101,7 @@ def extdiff(ui, repo, *pats, **opts): '''use external program to diff repository (or selected files) Show differences between revisions for the specified files, using - an external program. The default program used is "diff -Pnru". + an external program. The default program used is "diff -Npru". To select a different program, use the -p option. The program will be passed the names of two directories to compare. To pass additional options to the program, use the -o option. These will