Created
August 31, 2013 12:26
-
-
Save Ikke/6397889 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/git-am.sh b/git-am.sh | |
index c092855..875d42a 100755 | |
--- a/git-am.sh | |
+++ b/git-am.sh | |
@@ -126,7 +126,7 @@ fall_back_3way () { | |
O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` | |
rm -fr "$dotest"/patch-merge-* | |
- mkdir "$dotest/patch-merge-tmp-dir" | |
+ mkdir -p "$dotest/patch-merge-tmp-dir" | |
# First see if the patch records the index info that we can use. | |
cmd="git apply $git_apply_opt --build-fake-ancestor" && |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment