320 hg commit -m 8bar

   320 hg commit -m 8bar

   321 hg merge

   321 hg merge

   322 echo % keyword stays outside conflict zone

   322 echo % keyword stays outside conflict zone

   323 cat m

   323 cat m

   324 echo % resolve to local

   324 echo % resolve to local

   326 hg commit -m localresolve

   326 hg commit -m localresolve

   327 cat m

   327 cat m

   328 

   328 

   329 echo % switch off expansion

   329 echo % switch off expansion

   330 echo % kwshrink with unknown file u

   330 echo % kwshrink with unknown file u