diff -r cd8ca65475eb -r b07ef01406e4 hgkw/keyword.py
--- a/hgkw/keyword.py	Fri Aug 22 13:25:35 2008 +0200
+++ b/hgkw/keyword.py	Sun Aug 24 20:02:02 2008 +0200
@@ -96,7 +96,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.'''