Message ID | 20170203041624.9189-1-andrew.donnellan@au1.ibm.com |
---|---|
State | Accepted |
Headers | show |
diff --git a/src/git.rs b/src/git.rs index 9be867f..071f009 100644 --- a/src/git.rs +++ b/src/git.rs @@ -69,6 +69,7 @@ pub fn apply_patch(repo: &Repository, path: &Path) // We call out to "git am" since libgit2 doesn't implement "am" let output = Command::new("git") .arg("am") // apply from mbox + .arg("-3") // three way merge .arg(&path) // from our mbox file .current_dir(&workdir) // in the repo's working directory .output() // run synchronously