Show More
@@ -25,8 +25,8 diff --git a/a.txt b/a.txt | |||||
25 | merging a.txt |
|
25 | merging a.txt | |
26 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
26 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
27 | % printrepr.py a.txt |
|
27 | % printrepr.py a.txt | |
28 |
first |
|
28 | first | |
29 |
third |
|
29 | third | |
30 | % hg diff |
|
30 | % hg diff | |
31 | diff --git a/a.txt b/a.txt |
|
31 | diff --git a/a.txt b/a.txt | |
32 | --- a/a.txt |
|
32 | --- a/a.txt | |
@@ -57,8 +57,8 diff --git a/a.txt b/a.txt | |||||
57 | merging a.txt |
|
57 | merging a.txt | |
58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
58 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
59 | % printrepr.py a.txt |
|
59 | % printrepr.py a.txt | |
60 |
first |
|
60 | first | |
61 |
third |
|
61 | third | |
62 | % hg diff |
|
62 | % hg diff | |
63 | diff --git a/a.txt b/a.txt |
|
63 | diff --git a/a.txt b/a.txt | |
64 | --- a/a.txt |
|
64 | --- a/a.txt |
General Comments 0
You need to be logged in to leave comments.
Login now