blame: allow "blame file" in the middle of a conflicted merge
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 21:30:03 +0000 (14:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 21:30:03 +0000 (14:30 -0700)
commit9aeaab6...11dce596b4f6141d76f5300359bfd009
treecb2e3cd...27dbb35eef5a422a8c6b540b1af476accopy hash to clipboard (tree)
parentffcabcc...5df17f12997feedafefeb5589b8c0511copy hash to clipboard (diff)
builtin/blame.c
t/t8004-blame-with-conflicts.sh