changeset 29774 | a7f8939641aa |
parent 28627 | d7af9b4ae7dd |
child 29775 | 978b907d9b36 |
--- a/tests/test-copy-move-merge.t Tue Aug 09 09:15:46 2016 -0700 +++ b/tests/test-copy-move-merge.t Fri Aug 12 06:01:42 2016 -0700 @@ -85,7 +85,7 @@ > c > EOF rebasing 2:add3f11052fa "other" (tip) - remote changed a which local deleted + remote [source] changed a which local [dest] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c $ cat b