Mercurial > hg
view tests/test-issue1306.out @ 7385:8119c1a607c4
mergetools: add pointer to the usual filemerge path
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sun, 16 Nov 2008 20:56:55 -0800 |
parents | f82938c87b92 |
children | a3d73b3e1f8a |
line wrap: on
line source
% initialize remote repo with branches adding a marked working directory as branch br adding c changeset: 2:1630aed6ed2b branch: br tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: c changeset: 1:234f53e6c5ff branch: br user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: b changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a % try cloning -r branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 2:1630aed6ed2b branch: br tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: c % try cloning -rother clone#branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 0:cb9a9f314b8b user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: a % try cloning -r1 clone#branch requesting all changes adding changesets adding manifests adding file changes added 3 changesets with 2 changes to 2 files updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 1:234f53e6c5ff branch: br user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: b