Mercurial > hg
changeset 6562:090f2145df7d
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Fri, 18 Apr 2008 18:07:34 +0200 |
| parents | 8b67211d9140 (current diff) c242fc76958e (diff) |
| children | 3b6f18851d87 |
| files | hgext/mq.py |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/mq.py Wed Apr 16 15:26:37 2008 -0700 +++ b/hgext/mq.py Fri Apr 18 18:07:34 2008 +0200 @@ -937,6 +937,8 @@ qp = self.qparents(repo, top) if opts.get('git'): self.diffopts().git = True + if opts.get('unified') is not None: + self.diffopts().context = opts['unified'] self.printdiff(repo, qp, files=pats, opts=opts) def refresh(self, repo, pats=None, **opts):