merge from crew-stable
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Fri, 18 Apr 2008 18:07:34 +0200
changeset 6562 090f2145df7d
parent 6559 8b67211d9140 (current diff)
parent 6561 c242fc76958e (diff)
child 6563 3b6f18851d87
merge from crew-stable
hgext/mq.py
--- 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):