mirror of
https://github.com/git/git.git
synced 2024-05-19 11:46:07 +02:00
2300328cb2
When invoking default (g)vimdiff three-way merge, the merged file is loaded as the first buffer but moved to the bottom as the fourth window. This causes a disconnect between vim commands that operate on window positions (e.g. CTRL-W_w) and those that operate on buffer index (e.g. do/dp). This change reorders the buffers to have the same index as windows while keeping the cursor default to the merged result as the bottom window. Signed-off-by: Dickson Wong <dicksonwong@gmail.com> Tested-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
47 lines
890 B
Plaintext
47 lines
890 B
Plaintext
diff_cmd () {
|
|
"$merge_tool_path" -R -f -d \
|
|
-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
|
|
}
|
|
|
|
merge_cmd () {
|
|
touch "$BACKUP"
|
|
case "$1" in
|
|
gvimdiff|vimdiff)
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
|
|
"$LOCAL" "$BASE" "$REMOTE" "$MERGED"
|
|
else
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
fi
|
|
;;
|
|
gvimdiff2|vimdiff2)
|
|
"$merge_tool_path" -f -d -c 'wincmd l' \
|
|
"$LOCAL" "$MERGED" "$REMOTE"
|
|
;;
|
|
gvimdiff3|vimdiff3)
|
|
if $base_present
|
|
then
|
|
"$merge_tool_path" -f -d -c 'hid | hid | hid' \
|
|
"$LOCAL" "$REMOTE" "$BASE" "$MERGED"
|
|
else
|
|
"$merge_tool_path" -f -d -c 'hid | hid' \
|
|
"$LOCAL" "$REMOTE" "$MERGED"
|
|
fi
|
|
;;
|
|
esac
|
|
check_unchanged
|
|
}
|
|
|
|
translate_merge_tool_path() {
|
|
case "$1" in
|
|
gvimdiff|gvimdiff2|gvimdiff3)
|
|
echo gvim
|
|
;;
|
|
vimdiff|vimdiff2|vimdiff3)
|
|
echo vim
|
|
;;
|
|
esac
|
|
}
|