tests/test-manifest-merging.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:36:04 +0200
changeset 5143 fc6106267198
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

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