226    c

   226    c

   227   +=======

   227   +=======

   228   +a

   228   +a

   229   +>>>>>>> other

   229   +>>>>>>> other

   230   diff --git a/b.rename/b b/b.rename/b

   230   diff --git a/b.rename/b b/b.rename/b

   231   --- /dev/null

   232   --- /dev/null

   232   +++ b/b.rename/b

   233   +++ b/b.rename/b

   233   @@ -0,0 +1,1 @@

   234   @@ -0,0 +1,1 @@

   234   +b

   235   +b

   235   diff --git a/b/b b/b/b

   236   diff --git a/b/b b/b/b

   237   --- a/b/b

   238   --- a/b/b

   238   +++ /dev/null

   239   +++ /dev/null

   239   @@ -1,1 +0,0 @@

   240   @@ -1,1 +0,0 @@

   240   -b

   241   -b

   241   diff --git a/c.copy b/c.copy

   242   diff --git a/c.copy b/c.copy

   242   --- /dev/null

   244   --- /dev/null

   243   +++ b/c.copy

   245   +++ b/c.copy

   244   @@ -0,0 +1,1 @@

   246   @@ -0,0 +1,1 @@

   245   +c

   247   +c

   246   $ hg resolve -l

   248   $ hg resolve -l