1115   $Id$

  1115   $Id$

  1116   <<<<<<< working copy: 88a80c8d172e - test: 8bar

  1116   <<<<<<< working copy: 88a80c8d172e - test: 8bar

  1117   bar

  1117   bar

  1118   =======

  1118   =======

  1119   foo

  1119   foo

  1121 

  1121 

  1122 resolve to local, m must contain hash of last change (local parent)

  1122 resolve to local, m must contain hash of last change (local parent)

  1123 

  1123 

  1124   $ hg resolve -t internal:local -a

  1124   $ hg resolve -t internal:local -a

  1125   (no more unresolved files)

  1125   (no more unresolved files)