tests/test-manifest-merging.out
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 15:30:40 +0200
changeset 4453 28778dc77a4b
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
gitweb: shortlog template: removed excessive whitespace, added title bar. The title bar is currently empty, this is just a preparation for filling it with content.

% 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