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>
Markus Heidelberg committed
Jan 17, 2009 at 22:28 UTC
71ee483abd44b1a69cd2ac005c75d3c885830a5c
1 file changed
+7
-2
git-mergetool.sh
+7
-2
@@ -200,14 +200,19 @@ merge_file () {
200
fi
201
status=$?
202
;;
203
- meld|vimdiff)
203
+ meld)
204
touch "$BACKUP"
205
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
206
check_unchanged
207
;;
208
+ vimdiff)
209
+ touch "$BACKUP"
210
+ "$merge_tool_path" -c "wincmd l" "$LOCAL" "$MERGED" "$REMOTE"
211
+ check_unchanged
212
+ ;;
213
gvimdiff)
214
touch "$BACKUP"
210
- "$merge_tool_path" -f "$LOCAL" "$MERGED" "$REMOTE"
215
+ "$merge_tool_path" -c "wincmd l" -f "$LOCAL" "$MERGED" "$REMOTE"
216
check_unchanged
217
;;
218
xxdiff)