David Aguilar 76ca653842 difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff ... We shouldn't try to merge files when using difftool, so remove any merge-specific options. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2009-04-07 22:19:55 -07:00
..
git-difftool	contrib/difftool: use a separate config namespace for difftool commands	2009-03-11 21:54:59 -07:00
git-difftool-helper	difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff	2009-04-07 22:19:55 -07:00
git-difftool.txt	contrib/difftool: use a separate config namespace for difftool commands	2009-03-11 21:54:59 -07:00