Mercurial > hg

comparison tests/test-flags.out @ 3323:b7a46cbf3f59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with upstream
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 10 Oct 2006 09:30:05 +0200
parents 455109df3669 966632304dde
children 0ac7fee4f024
comparison
equal deleted inserted replaced
3322:a1aad25ccc3e 3323:b7a46cbf3f59
43 date: Mon Jan 12 13:46:40 1970 +0000 43 date: Mon Jan 12 13:46:40 1970 +0000
44 summary: added a b 44 summary: added a b
45 45
46 resolving manifests 46 resolving manifests
47 merging a 47 merging a
48 resolving a
49 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
50 (branch merge, don't forget to commit) 49 (branch merge, don't forget to commit)
51 pulling from ../test2 50 pulling from ../test2
52 searching for changes 51 searching for changes
53 adding changesets 52 adding changesets