diff options
| author | Manuel <2084639+tennox@users.noreply.github.com> | 2022-06-26 18:00:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-26 18:00:34 +0100 |
| commit | 117baee1b78f662291e980075668720179c1c455 (patch) | |
| tree | 20ec22cd2f829414fe5be78f915a33e793a6b5b9 | |
| parent | 3a85fd077cf8a404e0b7c727e47b8fcee85280a5 (diff) | |
Update src/nix/flake.cc
https://github.com/NixOS/nix/pull/6699#discussion_r904096906
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
| -rw-r--r-- | src/nix/flake.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |