From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2012 22:52:32 +0000 (-0700)
Subject: Merge branch 'jc/maint-blame-no-such-path'
X-Git-Tag: v1.8.0-rc0~47
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=992311cf860347df159081873fba099a94d463f4;p=git.git

Merge branch 'jc/maint-blame-no-such-path'

"git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.

Even during a conflicted merge, "git blame $path" always meant to
blame uncommitted changes to the "working tree" version; make it
more useful by showing cleanly merged parts as coming from the other
branch that is being merged.

* jc/maint-blame-no-such-path:
  blame: allow "blame file" in the middle of a conflicted merge
  blame $path: avoid getting fooled by case insensitive filesystems
---

992311cf860347df159081873fba099a94d463f4