Mercurial > hg
view tests/test-manifest-merging.out @ 8577:c7bab7fede4c
match: simplify _matcher
- get rid of special case
- simplify anypats logic
- fold inckinds and exckinds
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 24 May 2009 02:56:14 -0500 |
parents | 0750f11152fe |
children | a3d73b3e1f8a |
line wrap: on
line source
% 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