tests/test-graft.t
changeset 21082 0d67fccc0d43
parent 20945 18adc15635a1
child 21200 a1381eea7c7d
--- a/tests/test-graft.t	Sun Apr 06 13:39:51 2014 +0200
+++ b/tests/test-graft.t	Mon Apr 07 02:12:28 2014 +0200
@@ -150,6 +150,7 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
+   b: keep -> k
    e: remote is newer -> g
   getting e
   updating: e 1/1 files (100.00%)
@@ -159,6 +160,7 @@
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
+   b: keep -> k
    d: remote is newer -> g
    e: versions differ -> m
     preserving e for resolve of e