From ccbea9cdbbf553f5cddecd64ce3c631408ff90e3 Mon Sep 17 00:00:00 2001 From: steele-cjf Date: Mon, 21 Sep 2020 15:03:25 +0800 Subject: [PATCH 1/2] branch 1 --- testCommit.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testCommit.js b/testCommit.js index aaee620..95e1bbb 100644 --- a/testCommit.js +++ b/testCommit.js @@ -1,10 +1,4 @@ -// commit 1 -// commit 2 -// commit 3 -// commit 4 +// commit branch 1 function aa () { - console.log(111211) - console.log(222222) - console.log(333333) - console.log(4) + console.log('branch 1') } \ No newline at end of file From 186f8b6c9123e0a266b4fe76ac4df57b78f5d515 Mon Sep 17 00:00:00 2001 From: steele-cjf Date: Mon, 21 Sep 2020 15:03:46 +0800 Subject: [PATCH 2/2] branch 2 --- testCommit.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testCommit.js b/testCommit.js index 95e1bbb..6258278 100644 --- a/testCommit.js +++ b/testCommit.js @@ -1,4 +1,5 @@ // commit branch 1 +// commit branch 2 function aa () { - console.log('branch 1') + console.log('branch 2') } \ No newline at end of file