Mercurial > hg
diff hgext/extdiff.py @ 9982:ddc899096b7b
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Dec 2009 14:37:33 -0600 |
parents | 5e4ef56b4d42 6045a8c4dbbc |
children | d6512b3e9ac0 |
line wrap: on
line diff
--- a/hgext/extdiff.py Tue Dec 01 00:48:25 2009 +0100 +++ b/hgext/extdiff.py Tue Dec 01 14:37:33 2009 -0600 @@ -254,7 +254,8 @@ def save(cmd, path, diffopts): '''use closure to save diff command to use''' def mydiff(ui, repo, *pats, **opts): - return dodiff(ui, repo, path, diffopts, pats, opts) + return dodiff(ui, repo, path, diffopts + opts['option'], + pats, opts) doc = _('''\ use %(path)s to diff repository (or selected files)