tests/test-manifest-merging.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 21 Jun 2009 23:04:02 +0200
changeset 8882 48a04961b0dd
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
convert/svn: remove useless encoding/decoding calls (issue1676)

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved