From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 05:52:04 +0000 (-0700)
Subject: Merge branch 'da/difftool-test'
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b22d301b24b55dc59549833d285decbdd9b1ca53;p=git.git

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
---

b22d301b24b55dc59549833d285decbdd9b1ca53