see

xiejingpeng · xiejingpeng · commit e2094e5b48b3 · 2017-06-21T15:00:02.000+08:00
diff --git a/one b/one
@@ -1,5 +1,5 @@
 <<<<<<< HEAD
-local now it s three 
+local now it s three hacccc
 =======
-github now is four  just four
+github now is four 
 >>>>>>> a22b5027bd08171276d93991888a20d79d001724
diff --git a/one~ b/one~
@@ -1 +1,5 @@
-now it s two
+<<<<<<< HEAD
+local now it s three hacccc
+=======
+github now is four 
+>>>>>>> a22b5027bd08171276d93991888a20d79d001724
