# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1208534854 -7200
# Node ID 090f2145df7db6a638c53cee74a7fbd2fa6b9619
# Parent  8b67211d91404f64ea5061929e2cf14c53f8dc1e# Parent  c242fc76958eb41b776ac11c0e41360df0fa499b
merge from crew-stable

diff -r 8b67211d9140 -r 090f2145df7d 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):