Mercurial > hg

comparison tests/test-mq-safety.out @ 11181:6e65b451b62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix complaint about branch merge creating new heads (issue2186)
author Matt Mackall <mpm@selenic.com>
date Sat, 15 May 2010 21:24:23 -0500
parents 5b48d819d5f9
children ab237534d800
comparison
equal deleted inserted replaced
11180:4b02fc71bbba 11181:6e65b451b62e
19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 19 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
20 marked working directory as branch b 20 marked working directory as branch b
21 adding c 21 adding c
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 (branch merge, don't forget to commit) 23 (branch merge, don't forget to commit)
24 created new head
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 24 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
26 changeset: 2:65309210bf4e 25 changeset: 2:65309210bf4e
27 branch: b 26 branch: b
28 tag: tip 27 tag: tip
29 parent: 1:707adb4c8ae1 28 parent: 1:707adb4c8ae1