equal
deleted
inserted
replaced
42 date: Mon Jan 12 13:46:40 1970 +0000 |
42 date: Mon Jan 12 13:46:40 1970 +0000 |
43 summary: added a b |
43 summary: added a b |
44 |
44 |
45 resolving manifests |
45 resolving manifests |
46 merging a |
46 merging a |
47 resolving a |
|
48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
49 (branch merge, don't forget to commit) |
48 (branch merge, don't forget to commit) |
50 -rwxr-x--- |
49 -rwxr-x--- |
51 -rwxr-x--- |
50 -rwxr-x--- |