Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |From 7cab928170856474fabc30a62df50b4b79536fb9 Mon Sep 17 00:00:00 2001 |From: Jason Pena |Date: Wed, 4 Jun 2025 12:51:42 -0600 |Subject: [PATCH] Resolve patch conflicts for release 6.5 | |Resolve patch conflict for `buttonpress` in release version 6.5 of DWM |produced by `dwm-notitle-20210715-138b405.diff`. | |Signed-off-by: Jason Pena |--- | config.def.h | 1 - | dwm.c | 18 ++++-------------- | 2 files changed, 4 insertions(+), 15 deletions(-) | |diff --git a/config.def.h b/config.def.h |index 9efa774..4a415af 100644 |--- a/config.def.h |+++ b/config.def.h -------------------------- Patching file config.def.h using Plan A... Hunk #1 succeeded at 103. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/dwm.c b/dwm.c |index 1443802..e3f0281 100644 |--- a/dwm.c |+++ b/dwm.c -------------------------- Patching file dwm.c using Plan A... Hunk #1 succeeded at 64 (offset 1 line). Hunk #2 succeeded at 444 (offset 1 line). Hunk #3 succeeded at 735 (offset 1 line). Hunk #4 succeeded at 1238 (offset 1 line). Hmm... Ignoring the trailing garbage. done