From abf64025db2c23ac0f7f0f440d2ecd9597610c9b Mon Sep 17 00:00:00 2001
From: pythonwood <582223837@qq.com>
Date: Tue, 29 Oct 2013 23:44:32 +0800
Subject: [PATCH 1/4] merge-test change in master

---
 HelloWorld.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HelloWorld.py b/HelloWorld.py
index ef01310..26dcd35 100755
--- a/HelloWorld.py
+++ b/HelloWorld.py
@@ -5,3 +5,4 @@
 import os,sys,time
 print(time.ctime()+" Hello World !")
 print('\n'.join(sys.path))
+print("master merge test after rebase test is esaier")

From 6cf8c6cdef7a5e5a34a97717eb10db0ad43d4d4a Mon Sep 17 00:00:00 2001
From: pythonwood <582223837@qq.com>
Date: Tue, 29 Oct 2013 23:50:01 +0800
Subject: [PATCH 2/4] in master the same branch for merge

---
 HelloWorld.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HelloWorld.py b/HelloWorld.py
index 26dcd35..e228ac7 100755
--- a/HelloWorld.py
+++ b/HelloWorld.py
@@ -6,3 +6,4 @@
 print(time.ctime()+" Hello World !")
 print('\n'.join(sys.path))
 print("master merge test after rebase test is esaier")
+print("the same branch for merge for test 2")

From c68a90156d903d8748cfd31279788fe31f8e476b Mon Sep 17 00:00:00 2001
From: pythonwood <582223837@qq.com>
Date: Tue, 29 Oct 2013 23:53:22 +0800
Subject: [PATCH 3/4] -for merge conflect:1-

---
 README | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README b/README
index 0de8376..c2e108f 100644
--- a/README
+++ b/README
@@ -60,6 +60,7 @@ then commit again in master for README:
 20131029 for merge in merge1
 
 创建分支合并后不删除分支，到分支上再开发了一下。
+-for merge conflect:1-
 
 
 

From cbdbf0997c6b14040c54031c9e54fdeddc23a1ea Mon Sep 17 00:00:00 2001
From: pythonwood <582223837@qq.com>
Date: Tue, 29 Oct 2013 23:54:09 +0800
Subject: [PATCH 4/4] -for merge conflect:2-

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 0de8376..21ef178 100644
--- a/README
+++ b/README
@@ -60,6 +60,6 @@ then commit again in master for README:
 20131029 for merge in merge1
 
 创建分支合并后不删除分支，到分支上再开发了一下。
-
+-for merge conflect:2-