From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 May 2016 21:54:36 +0000 (-0700)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.9.0-rc0~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f895dd7422766f8ce95433619510e957e54f60cd;p=thirdparty%2Fgit.git

Merge branch 'da/difftool'

"git difftool" learned to handle unmerged paths correctly in
dir-diff mode.

* da/difftool:
  difftool: handle unmerged files in dir-diff mode
  difftool: initialize variables for readability
---

f895dd7422766f8ce95433619510e957e54f60cd