equal
deleted
inserted
replaced
|
1 (the addremove command is deprecated; use add and remove --after instead) |
1 adding a |
2 adding a |
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 diff -r 33aaa84a386b a |
5 diff -r 33aaa84a386b a |
5 --- a/a |
6 --- a/a |
6 +++ b/a |
7 +++ b/a |
7 @@ -1,1 +1,1 @@ a |
8 @@ -1,1 +1,1 @@ a |
8 -a |
9 -a |
9 +abc |
10 +abc |
|
11 (the addremove command is deprecated; use add and remove --after instead) |
10 adding b |
12 adding b |
11 M a |
13 M a |
12 changeset: 0:33aaa84a386b |
14 changeset: 0:33aaa84a386b |
13 user: test |
15 user: test |
14 date: Mon Jan 12 13:46:40 1970 +0000 |
16 date: Mon Jan 12 13:46:40 1970 +0000 |
86 +++ b/a |
88 +++ b/a |
87 @@ -1,1 +1,1 @@ a2 |
89 @@ -1,1 +1,1 @@ a2 |
88 -a2 |
90 -a2 |
89 +abc |
91 +abc |
90 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
93 (the addremove command is deprecated; use add and remove --after instead) |
91 adding b |
94 adding b |
92 M a |
95 M a |
93 changeset: 1:802f095af299 |
96 changeset: 1:802f095af299 |
94 user: test |
97 user: test |
95 date: Mon Jan 12 13:46:40 1970 +0000 |
98 date: Mon Jan 12 13:46:40 1970 +0000 |