tests/test-rebase-conflicts.t
changeset 34661 eb586ed5d8ce
parent 33844 437e317d7913
child 34865 a0100f34e20b
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   154   requesting all changes
   154   requesting all changes
   155   adding changesets
   155   adding changesets
   156   adding manifests
   156   adding manifests
   157   adding file changes
   157   adding file changes
   158   added 11 changesets with 8 changes to 3 files (+1 heads)
   158   added 11 changesets with 8 changes to 3 files (+1 heads)
       
   159   new changesets 24797d4f68de:2f2496ddf49d
   159   updating to branch default
   160   updating to branch default
   160   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   161   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   161   $ cd issue4041
   162   $ cd issue4041
   162   $ hg log -G
   163   $ hg log -G
   163   o    changeset:   10:2f2496ddf49d
   164   o    changeset:   10:2f2496ddf49d