2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2005-09-14 03:38:27 +04:00
|
|
|
%% no merges expected
|
2006-10-16 01:18:09 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2006-05-02 20:44:02 +04:00
|
|
|
(branch merge, don't forget to commit)
|
2006-10-11 18:35:09 +04:00
|
|
|
diff -r d9e5953b9dec b
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/b
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+This is file b1
|
|
|
|
M b
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2005-12-15 07:19:03 +03:00
|
|
|
%% merge should fail
|
2006-11-02 06:47:55 +03:00
|
|
|
abort: untracked local file 'b' differs from remote version
|
2005-09-14 03:38:27 +04:00
|
|
|
%% merge of b expected
|
2005-06-22 06:41:57 +04:00
|
|
|
merging for b
|
|
|
|
merging b
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2006-10-11 18:35:09 +04:00
|
|
|
diff -r d9e5953b9dec b
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/b
|
|
|
|
@@ -0,0 +1,1 @@
|
|
|
|
+This is file b2
|
|
|
|
M b
|
2005-09-14 03:38:27 +04:00
|
|
|
%%
|
2006-05-02 20:44:02 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2005-09-14 03:38:27 +04:00
|
|
|
Contents of b should be "this is file b1"
|
2005-06-22 09:07:08 +04:00
|
|
|
This is file b1
|
2005-12-15 07:19:03 +03:00
|
|
|
%% merge fails
|
2006-03-24 16:53:23 +03:00
|
|
|
abort: outstanding uncommitted changes
|
2005-09-14 03:38:27 +04:00
|
|
|
%% merge expected!
|
2006-10-16 01:18:09 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2006-05-02 20:44:02 +04:00
|
|
|
(branch merge, don't forget to commit)
|
2006-10-11 18:35:09 +04:00
|
|
|
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
|
2006-05-02 20:44:02 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2005-12-15 07:19:03 +03:00
|
|
|
%% merge of b should fail
|
2006-03-24 16:53:23 +03:00
|
|
|
abort: outstanding uncommitted changes
|
2005-09-14 03:38:27 +04:00
|
|
|
%% merge of b expected
|
2005-06-22 06:41:57 +04:00
|
|
|
merging for b
|
|
|
|
merging b
|
2006-05-02 20:44:02 +04:00
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2006-10-11 18:35:09 +04:00
|
|
|
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
|