On Wed, 6 Apr 2011, Mark Lodato wrote: > Commit 4d4d572, "status: show worktree status of conflicted paths > separately" introduced the following bug: If one tries to merge two > branches with a conflict, where the conflicting file was also copied > in one of the branches, "git status" (but not "git status -sb" or > git-gui) fails to report the unmerged status. You can use the below > test file to see the error. A similar test should probably be > integrated into one of the existing git-status test files, though you > may need to get rid of the "sed -i" command. > > $ git status > # On branch master > # Changes to be committed: > # > # renamed: file -> copy > # > $ git status -sb > ## master > R file -> copy > U file > > In the above, "git status" should have reported "file" being in an > unmerged state. It probably should also mark "copy" as a copy, not a > rename. I sent a patch for this not so long ago [1]. It is currently in "next" as commit d7c9bf2. I think Junio said the plan is to release it in 1.7.5. /Martin [1] http://thread.gmane.org/gmane.comp.version-control.git/169289/focus=169887 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html