lix-project/lix
20
57
Fork 31
Code Issues 351 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Update src/nix/flake.cc

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

Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
This commit is contained in:
Manuel 2022-06-26 18:00:34 +01:00 committed by GitHub
parent 3a85fd077c
commit 117baee1b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/flake.cc
View file

@ -760,7 +760,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
if (pathExists(to2)) { if (pathExists(to2)) {
auto contents2 = readFile(to2); auto contents2 = readFile(to2);
if (contents != contents2) { 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; success = false;
conflictedFiles.push_back(to2); conflictedFiles.push_back(to2);
} else { } else {