From: Junio C Hamano Date: Mon, 24 Sep 2012 19:40:02 +0000 (-0700) Subject: Merge branch 'jc/maint-blame-no-such-path' into maint X-Git-Tag: v1.7.12.2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/140011d8f2d17b050942e8a4bb33ecbd6827df2e Merge branch 'jc/maint-blame-no-such-path' into maint 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. This incidentally fixes an unrelated problem on a case insensitive filesystem, where "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" did not say "No such file MAKEFILE in HEAD" but pretended as if "MAKEFILE" was a newly added file. * 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 --- 140011d8f2d17b050942e8a4bb33ecbd6827df2e