39 added 1 changesets with 1 changes to 1 files (+1 heads) |
39 added 1 changesets with 1 changes to 1 files (+1 heads) |
40 updating to 2:97d72e5f12c7 |
40 updating to 2:97d72e5f12c7 |
41 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
42 merging with 1:5e056962225c |
42 merging with 1:5e056962225c |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
44 new changeset 3:0b6439e938f9 merges remote changes with local |
44 new changeset 3:... merges remote changes with local |
45 Automated merge with http://localhost:20059/ |
45 Automated merge with http://localhost:20059/ |
46 % fetch over http with auth (should be hidden in desc) |
46 % fetch over http with auth (should be hidden in desc) |
47 pulling from http://user:***@localhost:20059/ |
47 pulling from http://user:***@localhost:20059/ |
48 searching for changes |
48 searching for changes |
49 adding changesets |
49 adding changesets |
52 added 1 changesets with 1 changes to 1 files (+1 heads) |
52 added 1 changesets with 1 changes to 1 files (+1 heads) |
53 updating to 2:97d72e5f12c7 |
53 updating to 2:97d72e5f12c7 |
54 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
54 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
55 merging with 1:5e056962225c |
55 merging with 1:5e056962225c |
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 new changeset 3:0b6439e938f9 merges remote changes with local |
57 new changeset 3:... merges remote changes with local |
58 Automated merge with http://localhost:20059/ |
58 Automated merge with http://localhost:20059/ |
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
59 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
61 adding f |
61 adding f |
62 adding g |
62 adding g |