From: Frank Li Date: Fri, 27 Feb 2009 14:53:19 GMT Subject: git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case. Message-ID: <1976ea660902270653p3b144231h86b98244173d09@mail.gmail.com> $ git ls-files -u 100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1 rb1.txt 100644 e776c70dbc6ea929021515cf4d45a207a2f56517 3 rb1.txt but use git.exe diff-index --cached --raw HEAD show nothing.