diff for duplicates of <cover.1519916440.git.lucien.xin@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 2c0dd11..615b930 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,8 @@ the solution is to: <<<<<<< HEAD [A] - === [B] + ======= + [B] >>>>>>> 2277c7c... sctp: Add LSM hooks 2. and apply the following diff-output: diff --git a/a/content_digest b/N1/content_digest index 854ee61..f7c65f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Xin Long <lucien.xin@gmail.com>\0" "Subject\0[PATCH net-next 0/9] sctp: clean up sctp_sendmsg\0" - "Date\0Thu, 01 Mar 2018 15:05:09 +0000\0" + "Date\0Thu, 1 Mar 2018 23:05:09 +0800\0" "To\0network dev <netdev@vger.kernel.org>" " linux-sctp@vger.kernel.org\0" "Cc\0Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>" @@ -29,7 +29,8 @@ "\n" " <<<<<<< HEAD\n" " [A]\n" - " === [B]\n" + " =======\n" + " [B]\n" " >>>>>>> 2277c7c... sctp: Add LSM hooks\n" "\n" "2. and apply the following diff-output:\n" @@ -87,4 +88,4 @@ "-- \n" 2.1.0 -a7b9a71666aa545726183c6b58d59be616dfdb7fe0b1990c31b420c7c04ef7b7 +33b2ab8d9589a2f59636b9da0ea9f8a0fa834dc695dc9bb19af2ffc012a02ed2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.