Mercurial > hg > mercurial-crew-with-dirclash

diff hgext/mq.py @ 2921:addb58e3b41c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
redo merge with mpm. previous merge at ef8ee4477019 was bad.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 16 Aug 2006 10:52:19 -0700
parents b70740aefa4d 3848488244fc
children 773c5b82d052
line wrap: on
line diff
--- a/hgext/mq.py
+++ b/hgext/mq.py
@@ -77,7 +77,7 @@ class queue:
 
     def diffopts(self):
         if self._diffopts is None:
-            self._diffopts = self.ui.diffopts()
+            self._diffopts = patch.diffopts(self.ui)
         return self._diffopts
 
     def join(self, *p):