diff -r ad766066d1bc -r a6f4e1367978 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Aug 21 19:07:33 2008 +0200
+++ b/hgkw/keyword.py	Fri Aug 22 11:53:30 2008 +0200
@@ -100,7 +100,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.'''