author | Bryan O'Sullivan <bos@serpentine.com> |
Mon, 24 Aug 2009 16:30:42 -0700 | |
changeset 9486 | dd8d10c36c9c |
parent 6336 | 4b0c9c674707 |
permissions | -rw-r--r-- |
% manifest of p2: bar foo created new head % manifest of p1: foo 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % this should not mention bar: changeset: 3:ef2fc9b4a51b tag: tip parent: 2:ed1b79f46b9a parent: 1:d394a8db219b user: test date: Thu Jan 01 00:00:00 1970 +0000 description: merge rev offset length base linkrev nodeid p1 p2 0 0 5 0 1 b004912a8510 000000000000 000000000000