1056   >>>>>>> other

  1056   >>>>>>> other

  1057 

  1057 

  1058 resolve to local

  1058 resolve to local

  1059 

  1059 

  1060   $ HGMERGE=internal:local hg resolve -a

  1060   $ HGMERGE=internal:local hg resolve -a

  1061   $ hg commit -m localresolve

  1062   $ hg commit -m localresolve

  1062   $ cat m

  1063   $ cat m

  1063   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $

  1064   $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $

  1064   bar

  1065   bar

  1065 

  1066