{"thread":{"id":"18045","subject":"git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.","startedAt":"2009-02-27T14:53:19Z","lastAt":"2009-02-27T15:28:46Z","messageCount":2,"participants":["Frank Li","Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"106438","messageId":"1976ea660902270653p3b144231h86b98244173d09@mail.gmail.com","threadId":"18045","inReplyTo":null,"subject":"git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.","fromName":"Frank Li","fromEmail":"lznuaa@gmail.com","sentAt":"2009-02-27T14:53:19Z","receivedAt":"2009-02-27T14:53:19Z","isPatch":false,"sender":{"key":"lznuaa@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40642?v=4"},"body":"$ git ls-files -u\n100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1       rb1.txt\n100644 e776c70dbc6ea929021515cf4d45a207a2f56517  3       rb1.txt\n\n\nbut use git.exe diff-index  --cached --raw HEAD\nshow nothing.\n"},{"id":"106440","messageId":"49A806AE.7010402@viscovery.net","threadId":"18045","inReplyTo":"1976ea660902270653p3b144231h86b98244173d09@mail.gmail.com","subject":"Re: git.exe diff-index --cached --raw HEAD can not show unmerged file at delete conflict case.","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-02-27T15:28:46Z","receivedAt":"2009-02-27T15:28:46Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Frank Li schrieb:\n> $ git ls-files -u\n> 100644 658b87c67a68f0b17a835c66ab735e4bbcc5b3ab 1       rb1.txt\n> 100644 e776c70dbc6ea929021515cf4d45a207a2f56517  3       rb1.txt\n> \n> \n> but use git.exe diff-index  --cached --raw HEAD\n> show nothing.\n\nThat's correct, AFAICS. You have a delete/modify conflict. You deleted\nrb1.txt locally, yet the branch that you merged in modified it.\n\nHEAD does not have the file, nor is it in the index in stage 0 nor stage 2\n(\"ours\"). There is nothing to compare.\n\n-- Hannes\n"}]}