tests/test-manifest-merging.out
author Adrian Buehlmann <adrian@cadifra.com>
Tue, 31 Aug 2010 11:57:02 +0200
changeset 12141 5f44daa8fbd0
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
tests: unify test-diff-unified

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating to branch default
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