зеркало из https://github.com/microsoft/git.git
mergetool: put the cursor on the editable file for Vim
When resolving conflicts, you only need to edit the $MERGED file. Put the cursor automatically into its window for vimdiff and gvimdiff to avoid doing <C-w>l every time. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Tested-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a83c88525e
Коммит
71ee483abd
|
@ -200,14 +200,19 @@ merge_file () {
|
|||
fi
|
||||
status=$?
|
||||
;;
|
||||
meld|vimdiff)
|
||||
meld)
|
||||
touch "$BACKUP"
|
||||
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
|
||||
check_unchanged
|
||||
;;
|
||||
vimdiff)
|
||||
touch "$BACKUP"
|
||||
"$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
|
||||
check_unchanged
|
||||
;;
|
||||
gvimdiff)
|
||||
touch "$BACKUP"
|
||||
"$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"
|
||||
"$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
|
||||
check_unchanged
|
||||
;;
|
||||
xxdiff)
|
||||
|
|
Загрузка…
Ссылка в новой задаче