Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-issue612.out @ 5416:ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sun, 07 Oct 2007 21:56:36 +0300 |
parents | 9797124581c9 |
children |
rev | line source |
---|---|
4820
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 adding src/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 copying src/a.c to source/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 removing src/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 ? src/a.o |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 merging src/a.c and source/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 (branch merge, don't forget to commit) |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 M source/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 R src/a.c |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 ? source/a.o |