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)
commitb22d301b24b55dc59549833d285decbdd9b1ca53
tree2841295804d56eb193bc8f2bb3aac628fe3b577d
parent3ff999e16bd12f10a2bd5ee464ba8b5f1725866d
parentd50b2c73b6ffcdc9a55efa38542d02773df44407
Merge branch 'da/difftool-test'

Makes sure "difftool" options can be given in any order.

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