tests/test-rebase-abort.t
changeset 46811 5a0b930cfb3e
parent 45840 527ce85c2e60
child 50085 ff12f42415f5
equal deleted inserted replaced
46809:56d441256e82 46811:5a0b930cfb3e
    93   file: common (state "u")
    93   file: common (state "u")
    94     local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "")
    94     local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "")
    95     ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
    95     ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
    96     other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
    96     other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
    97     extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c
    97     extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c
       
    98     extra: merged = yes
    98   $ hg resolve -l
    99   $ hg resolve -l
    99   U common
   100   U common
   100 
   101 
   101 Insert unsupported mandatory merge record:
   102 Insert unsupported mandatory merge record:
   102 
   103