From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Jun 2016 21:27:37 +0000 (-0700)
Subject: Merge branch 'da/difftool' into maint
X-Git-Tag: v2.8.4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=389c3289cfa5bc0a232ad52df70fae1f6863d1a4;p=thirdparty%2Fgit.git

Merge branch 'da/difftool' into maint

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

389c3289cfa5bc0a232ad52df70fae1f6863d1a4