| commit | 7b1042292d5dc18508213c3be888b740d02f02e3 | |
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | |
| Mon, 23 Nov 2009 23:29:17 +0000 (24 00:29 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 23 Nov 2009 23:38:04 +0000 (23 15:38 -0800) | ||
| tree | 4209eb7a0f58a34f8025d97c1d2ec6ed9c62c0f3 | treesnapshot (tar.gz zip) |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory |