Mercurial > hg

comparison tests/test-parents.out @ 8761:0289f384e1e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Generally replace "file name" with "filename" in help and comments.
author timeless <timeless@gmail.com>
date Tue, 09 Jun 2009 09:25:17 -0400
parents 4b0c9c674707
children
comparison
equal deleted inserted replaced
8760:bf17aeafb869 8761:0289f384e1e5
51 user: test 51 user: test
52 date: Thu Jan 01 00:00:01 1970 +0000 52 date: Thu Jan 01 00:00:01 1970 +0000
53 summary: a 53 summary: a
54 54
55 % hg parents -r 2 glob:a 55 % hg parents -r 2 glob:a
56 abort: can only specify an explicit file name 56 abort: can only specify an explicit filename
57 % merge working dir with 2 parents, hg parents c 57 % merge working dir with 2 parents, hg parents c
58 merging c 58 merging c
59 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 59 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
60 (branch merge, don't forget to commit) 60 (branch merge, don't forget to commit)
61 changeset: 3:02d851b7e549 61 changeset: 3:02d851b7e549