Andrew's git / gitweb.git / diff
?
Merge branch 'da/mergetool-lib'
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:41:51 +0000 (01:41 -0700)
committerJunio 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

Trivial merge