From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Dec 2013 22:58:13 +0000 (-0800)
Subject: Merge branch 'zk/difftool-counts'
X-Git-Tag: v1.9-rc0~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6904f9aa5ba7666cdb5390733225e123fe25526b;p=git

Merge branch 'zk/difftool-counts'

Show the total number of paths and the number of paths shown so far
when "git difftool" prompts to launch an external diff tool, which
would give users some sense of progress.

* zk/difftool-counts:
  diff.c: fix some recent whitespace style violations
  difftool: display the number of files in the diff queue in the prompt
---

6904f9aa5ba7666cdb5390733225e123fe25526b