difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
authorDavid Aguilar <davvid@gmail.com>
Mon, 6 Apr 2009 08:31:19 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:19:55 +0000 (22:19 -0700)
commit76ca653...42057766773776bffc6a415b39d5a147
treec1fcbd4...a3c3819f0b3a132048ad92daf74c63c6copy hash to clipboard (tree)
parentb98c212...9fd97300a8cf39015b8d693f319fd71ccopy hash to clipboard (diff)
contrib/difftool/git-difftool-helper