Home Explore Help
Sign In
peace
/
git_study
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

test 3way merge conflict

peace 2 years ago
parent
1e96ebc513
commit
c1c8a41fb1
1 changed files with 1 additions and 0 deletions
Unified View Show Diff Stats
  1. 1 0
      dev.txt

+ 1 - 0
dev.txt
View File 

@@ -1 +1,2 @@
 
 dev
 
 dev
 
+test 3way merge with conflict change by master