All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <30989671-7159-4b4f-bbf7-29303a9e13ea@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 8281cd5..bf58ba1 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -118,8 +118,3 @@ hint: If you prefer to skip this patch, run "git am --skip" instead.
 hint: To restore the original branch and stop patching, run "git am 
 --abort".
 hint: Disable this message with "git config set advice.mergeConflict false"
-
--- 
-linux-phy mailing list
-linux-phy@lists.infradead.org
-https://lists.infradead.org/mailman/listinfo/linux-phy
diff --git a/a/content_digest b/N1/content_digest
index a2a0a88..3655f8e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -139,11 +139,6 @@
  "hint: If you prefer to skip this patch, run \"git am --skip\" instead.\n"
  "hint: To restore the original branch and stop patching, run \"git am \n"
  "--abort\".\n"
- "hint: Disable this message with \"git config set advice.mergeConflict false\"\n"
- "\n"
- "-- \n"
- "linux-phy mailing list\n"
- "linux-phy@lists.infradead.org\n"
- https://lists.infradead.org/mailman/listinfo/linux-phy
+ "hint: Disable this message with \"git config set advice.mergeConflict false\""
 
-f53aa7620583e34719d494332d88a9ac182501d0644bc4af6e99b0748b65c1b6
+060107b5faac8e30670d2b19d2358f8c540895da28457b262709d46f516d86c0

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.