Mercurial > hg

comparison tests/test-issue612.out @ 6512:368a4ec603cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents 4b0c9c674707
children
comparison
equal deleted inserted replaced
6511:5c1bb5750558 6512:368a4ec603cc
1 adding src/a.c 1 adding src/a.c
2 moving src/a.c to source/a.c 2 moving src/a.c to source/a.c
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 created new head 4 created new head
5 ? src/a.o 5 ? src/a.o
6 merging src/a.c and source/a.c 6 merging src/a.c and source/a.c to source/a.c
7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
8 (branch merge, don't forget to commit) 8 (branch merge, don't forget to commit)
9 M source/a.c 9 M source/a.c
10 R src/a.c 10 R src/a.c
11 ? source/a.o 11 ? source/a.o