tests/test-manifest-merging.out
author Eric Hopper <hopper@omnifarious.org>
Wed, 08 Aug 2007 22:47:30 +0200
changeset 5123 f94dbc6c7eaf
parent 3352 be8efb6e1cc6
permissions -rw-r--r--
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.

% 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