Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-filebranch.out @ 3044:fcadf7a32425
Merge with mpm
author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
---|---|
date | Sun, 03 Sep 2006 06:06:02 -0400 |
parents | fb493241d7f6 |
children | 966632304dde |
comparison
equal
deleted
inserted
replaced
3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
---|---|
29 0 0 77 0 0 c36078bec30d 000000000000 000000000000 | 29 0 0 77 0 0 c36078bec30d 000000000000 000000000000 |
30 1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 | 30 1 77 73 1 1 182b283965f1 c36078bec30d 000000000000 |
31 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 | 31 2 150 71 2 2 a6aef98656b7 c36078bec30d 000000000000 |
32 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 | 32 3 221 72 3 3 0c2cc6fc80e2 182b283965f1 a6aef98656b7 |
33 log should show foo and quux changed | 33 log should show foo and quux changed |
34 changeset: 3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9 | 34 changeset: 3:0c2cc6fc80e2 |
35 tag: tip | 35 tag: tip |
36 parent: 1:182b283965f1069c0112784e30e7755ad1c0dd52 | 36 parent: 1:182b283965f1 |
37 parent: 2:a6aef98656b71154cae9d87408abe6d0218c8045 | 37 parent: 2:a6aef98656b7 |
38 user: test | 38 user: test |
39 date: Mon Jan 12 13:46:40 1970 +0000 | 39 date: Mon Jan 12 13:46:40 1970 +0000 |
40 files: foo quux | 40 files: foo quux |
41 description: | 41 description: |
42 merge | 42 merge |