Merge branch 'tr/diff-submodule-no-reuse-worktree'
"git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * tr/diff-submodule-no-reuse-worktree: diff: do not reuse_worktree_file for submodules
Junio C Hamano committed
Mar 14, 2014 at 14:25 UTC
481e6aaaccbef810f6c43cfd46058cff36cb1c66
No changes.