| commit | 71ee483abd44b1a69cd2ac005c75d3c885830a5c | |
| author | Markus Heidelberg <markus.heidelberg@web.de> | |
| Sat, 17 Jan 2009 21:28:45 +0000 (17 22:28 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Jan 2009 20:29:32 +0000 (18 12:29 -0800) | ||
| tree | 96d139c37ec48d8240d46b7bf741a7abbb9423c3 | treesnapshot (tar.gz zip) |
| parent | a83c88525ed6d8d940f8cf7f21e92b189f7844e3 | commitdiff |
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>
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>
| git-mergetool.sh | diffblobblamehistory |