From 3cc7e8174dcac10707da5eb403d3827d30646928 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 26 Mar 2025 08:59:29 +0000
Subject: [PATCH] libutil: Fix error message

I encountered this with a misconfigured libutil. I doubt that a
non-lutimes config is viable, because tests were failing.

(cherry picked from commit 1cffcd91a91c8d7b9bed0da35405344c0c6b98dd)

# Conflicts:
#	src/libutil/file-system.cc
---
 src/libutil/file-system.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 558593ca3..2ee6860f8 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -613,7 +613,11 @@ void setWriteTime(
         if (utimes(path.c_str(), times) == -1)
             throw SysError("changing modification time of '%s' (not a symlink)", path);
     } else {
+<<<<<<< HEAD
         throw Error("Cannot modification time of symlink '%s'", path);
+=======
+        throw Error("Cannot change modification time of symlink %s", path);
+>>>>>>> 1cffcd91a (libutil: Fix error message)
     }
 #endif
 #endif