Show More
test-merge1.out
55 lines
| 1.5 KiB
| text/plain
|
TextLexer
/ tests / test-merge1.out
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1236 | %% no merges expected | ||
|
r3400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2175 | (branch merge, don't forget to commit) | ||
|
r3330 | diff -r d9e5953b9dec b | ||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,1 @@ | ||||
+This is file b1 | ||||
M b | ||||
|
r2175 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
r1581 | %% merge should fail | ||
|
r3618 | abort: untracked local file 'b' differs from remote version | ||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r3330 | diff -r d9e5953b9dec b | ||
--- /dev/null | ||||
+++ b/b | ||||
@@ -0,0 +1,1 @@ | ||||
+This is file b2 | ||||
M b | ||||
|
r1236 | %% | ||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1236 | Contents of b should be "this is file b1" | ||
|
r430 | This is file b1 | ||
|
r1581 | %% merge fails | ||
|
r1995 | abort: outstanding uncommitted changes | ||
|
r1236 | %% merge expected! | ||
|
r3400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2175 | (branch merge, don't forget to commit) | ||
|
r3330 | diff -r c1dd73cbf59f b | ||
--- a/b | ||||
+++ b/b | ||||
@@ -1,1 +1,1 @@ This is file b1 | ||||
-This is file b1 | ||||
+This is file b22 | ||||
M b | ||||
|
r2175 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r1581 | %% merge of b should fail | ||
|
r1995 | abort: outstanding uncommitted changes | ||
|
r1236 | %% merge of b expected | ||
|
r407 | merging for b | ||
merging b | ||||
|
r2175 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
|
r3330 | diff -r c1dd73cbf59f b | ||
--- a/b | ||||
+++ b/b | ||||
@@ -1,1 +1,1 @@ This is file b1 | ||||
-This is file b1 | ||||
+This is file b33 | ||||
M b | ||||