Mercurial > public > mercurial-scm > hg
diff hgext/extdiff.py @ 9957:ad44e1f8b3f3
merge with stable
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 30 Nov 2009 19:52:03 +0100 |
parents | 5e4ef56b4d42 6045a8c4dbbc |
children | d6512b3e9ac0 |
line wrap: on
line diff
--- a/hgext/extdiff.py Mon Nov 30 16:53:05 2009 +0100 +++ b/hgext/extdiff.py Mon Nov 30 19:52:03 2009 +0100 @@ -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)