mergetool-lib: combine vimdiff and gvimdiff run blocks
They are nearly identical outside of the foreground flag, which can safely be passed to both vim and gvim. The merge tool itself is named in $merge_tool_path. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dan McGee committed
Sep 14, 2010 at 21:21 UTC
ae69fd0481fa7bb39ee9ee68dc2e009d500e3b1d
1 file changed
+3
-14
git-mergetool--lib.sh
+3
-14
@@ -169,25 +169,14 @@ run_merge_tool () {
169
"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
170
fi
171
;;
172
- vimdiff)
173
- if merge_mode; then
174
- touch "$BACKUP"
175
- "$merge_tool_path" -d -c "wincmd l" \
176
- "$LOCAL" "$MERGED" "$REMOTE"
177
- check_unchanged
178
- else
179
- "$merge_tool_path" -d -c "wincmd l" \
180
- "$LOCAL" "$REMOTE"
181
- fi
182
- ;;
183
- gvimdiff)
172
+ vimdiff|gvimdiff)
173
if merge_mode; then
174
touch "$BACKUP"
186
- "$merge_tool_path" -d -c "wincmd l" -f \
175
+ "$merge_tool_path" -f -d -c "wincmd l" \
176
"$LOCAL" "$MERGED" "$REMOTE"
177
check_unchanged
178
else
190
- "$merge_tool_path" -d -c "wincmd l" -f \
179
+ "$merge_tool_path" -f -d -c "wincmd l" \
180
"$LOCAL" "$REMOTE"
181
fi
182
;;