Rebase/Cherry-pick Dialog conflict list fail to refresh the status of resolved deleted file

By @ch3cooli on October 22, 2012 05:43 (imported from Google Code)

---

What steps will reproduce the problem?

1. Create a base commit with 1.txt in master branch
2. delete 1.txt and commit to master
3. Create branch2 based on the common commit, modify 1.txt and add 2.txt
4. Cherry-pick branch2 into master
5. Conflict arise
6. Double click 1.txt in conflict list
7. Click delete button
8. Right click and mark as resolved
   If step 8 is skipped, then it works.

What is the expected output? What do you see instead?
Expected: The list refreshes the status of 1.txt and say "Deleted"
Actual:
After step 7, the list still says "Conflict"
After step 8, fatal: pathspec '1.txt' did not match any files

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.7.14
msysgit 1.7.10
Win 7 x64