summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorLibravatar René Scharfe <rene.scharfe@lsrfire.ath.cx>2009-11-24 00:29:17 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-23 15:38:04 -0800
commit7b1042292d5dc18508213c3be888b740d02f02e3 (patch)
tree4209eb7a0f58a34f8025d97c1d2ec6ed9c62c0f3 /entry.c
parentGIT 1.6.5 (diff)
downloadtgif-7b1042292d5dc18508213c3be888b740d02f02e3.tar.xz
mergetool--lib: simplify guess_merge_tool()
Use a case statement instead of calling grep to find out if the editor's name contains the string "vim". Remove the check for emacs, as this branch did the same as the default one anyway. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'entry.c')
0 files changed, 0 insertions, 0 deletions