Fix for merge conflict.

rust-lang · Dec 19, 2019 · ce7fd68 · ce7fd68
1 parent b392e7b
commit ce7fd68
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/cargo/util/config/mod.rs b/src/cargo/util/config/mod.rs
@@ -1526,8 +1526,8 @@ pub fn save_credentials(cfg: &Config, token: String, registry: Option<String>) -
 
     if let Some(_) = registry {
         if let Some(table) = toml.as_table_mut().unwrap().remove("registries") {
-            let v = CV::from_toml(file.path(), table)?;
-            value.merge(v)?;
+            let v = CV::from_toml(Definition::Path(file.path().to_path_buf()), table)?;
+            value.merge(v, false)?;
         }
     }
     toml.as_table_mut().unwrap().insert(key, value.into_toml());