112 Whatever ... commit something so we can invoke merge when updating

   113 

   114   $ hg commit -m '3: Merge'

   115 

   116 Updating from largefile to normal - no reason to prompt

   117 

   118   $ hg up -r 2

   119   getting changed largefiles

   120   0 largefiles updated, 0 removed

   121   1 files updated, 0 files merged, 1 files removed, 0 files unresolved

   122   $ cat foo

   123   normal

   124 

   125 (the update above used to leave the working dir in a very weird state - clean it

   126   $ hg up -qr null

   127   $ hg up -qr 2

   128 )

   129 

   130 Updating from normal to largefile - no reason to prompt

   131 

   132   $ hg up -r 3

   133   getting changed largefiles

   134   1 largefiles updated, 0 removed

   135   1 files updated, 0 files merged, 1 files removed, 0 files unresolved

   136   $ cat foo

   137   large

   138