diff options
| -rw-r--r-- | mergetools/vimdiff | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index f8ad6b35d4..e536ab6bfe 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -305,6 +305,9 @@ gen_cmd () { elif echo "$LAYOUT" | grep @BASE >/dev/null then FINAL_TARGET="BASE" + elif echo "$LAYOUT" | grep @REMOTE >/dev/null + then + FINAL_TARGET="REMOTE" else FINAL_TARGET="MERGED" fi |