--- a/hgext/keyword.py	Fri Aug 22 13:25:35 2008 +0200
+++ b/hgext/keyword.py	Fri Aug 22 08:26:18 2008 +0200
@@ -94,7 +94,7 @@
 
 # hg commands that trigger expansion only when writing to working dir,
 # not when reading filelog, and unexpand when reading from working dir
-restricted = 'record qfold qimport qnew qpush qrefresh qrecord'
+restricted = 'merge record resolve qfold qimport qnew qpush qrefresh qrecord'
 
 def utcdate(date):
     '''Returns hgdate in cvs-like UTC format.'''