diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:52:16 -0700 |
| commit | 6c252ef79e314eef8fca862cca8a63329fa7591c (patch) | |
| tree | 0d78f94339a811b18905a594a257dd003cb52ce2 | |
| parent | 2da61dcf9e678f36f8287b2cacdec2ebf014ae69 (diff) | |
| parent | 0a0ec7bd66786bcc2204f299f6c993db19d1f53c (diff) | |
| download | git-6c252ef79e314eef8fca862cca8a63329fa7591c.tar.gz git-6c252ef79e314eef8fca862cca8a63329fa7591c.tar.xz | |
Merge branch 'cj/p4merge'
* cj/p4merge:
Pass empty file to p4merge where no base is suitable.
| -rw-r--r-- | git-mergetool--lib.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index fb3f52ba2..4db921233 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -258,12 +258,9 @@ run_merge_tool () { ;; p4merge) if merge_mode; then - touch "$BACKUP" - if $base_present; then - "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" - else - "$merge_tool_path" "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED" - fi + touch "$BACKUP" + $base_present || >"$BASE" + "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" check_unchanged else "$merge_tool_path" "$LOCAL" "$REMOTE" |