Andrew's git / gitweb.git / diff
?
Merge branch 'da/difftool-test'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:52:04 +0000 (22:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:52:04 +0000 (22:52 -0700)
Makes sure "difftool" options can be given in any order.

By David Aguilar
* da/difftool-test:
t7800: Test difftool passing arguments to diff

Trivial merge