From: David Aguilar <davvid@gmail.com>
Date: Mon, 16 May 2016 18:05:37 +0000 (-0700)
Subject: difftool: handle unmerged files in dir-diff mode
X-Git-Tag: v2.8.4~2^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/366f9cea18fbb7ebb0a75735da8c2a9d5a916809?hp=366f9cea18fbb7ebb0a75735da8c2a9d5a916809

difftool: handle unmerged files in dir-diff mode

When files are unmerged they can show up as both unmerged and
modified in the output of `git diff --raw`.  This causes
difftool's dir-diff to create filesystem entries for the same
path twice, which fails when it encounters a duplicate path.

Ensure that each worktree path is only processed once.
Add a test to demonstrate the breakage.

Reported-by: Jan Smets <jan@smets.cx>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---