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

Junio C Hamano committed Apr 15, 2012 at 22:52 UTC b22d301b24b55dc59549833d285decbdd9b1ca53

No changes.