Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 7387:7e9a15fa6c8f
update help on git diffs
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 18 Nov 2008 15:35:34 -0600 |
parents | e17dbf140035 |
children | 040484030491 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Nov 17 11:45:38 2008 -0800 +++ b/mercurial/commands.py Tue Nov 18 15:35:34 2008 -0600 @@ -1005,7 +1005,7 @@ probably with undesirable results. Use the --git option to generate diffs in the git extended diff - format. Read the gitdiffs help topic for more information. + format. Read the diffs help topic for more information. """ node1, node2 = cmdutil.revpair(repo, opts.get('rev')) @@ -1042,7 +1042,7 @@ probably with undesirable results. Use the --git option to generate diffs in the git extended diff - format. Read the gitdiffs help topic for more information. + format. Read the diffs help topic for more information. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge.