author | Junio C Hamano <gitster@pobox.com> | |
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700) |
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge
mergetool--lib: specialize diff options for emerge and ecmerge
Trivial merge