From 117baee1b78f662291e980075668720179c1c455 Mon Sep 17 00:00:00 2001
From: Manuel <2084639+tennox@users.noreply.github.com>
Date: Sun, 26 Jun 2022 18:00:34 +0100
Subject: Update src/nix/flake.cc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/NixOS/nix/pull/6699#discussion_r904096906

Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
---
 src/nix/flake.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/flake.cc')

diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 24255c247..fdb373f24 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -760,7 +760,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
                     if (pathExists(to2)) {
                         auto contents2 = readFile(to2);
                         if (contents != contents2) {
-                            printError("refusing to overwrite existing file '%s'\n-> merge manually with '%s'", to2, from2);
+                            printError("refusing to overwrite existing file '%s'\n please merge it manually with '%s'", to2, from2);
                             success = false;
                             conflictedFiles.push_back(to2);
                         } else {
-- 
cgit v1.2.3