# HG changeset patch # User Benoit Boissinot # Date 1148400640 -7200 # Node ID 61f139601224b607d756de11ad24b3f3af4541b3 # Parent 11422943cf72a7cd908c24b37271874e2581e8bf# Parent 391c5d0f9ef3e0768295de492a588ef997223fa3 merge with crew diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- 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