bill lam schrieb:
Sometimes during rebase -i, it stopped with an unmerged file but that
file did not have any sections of conflict marked. ls-files showed it
had :1: and :2: but no :3: I suspected that file was git-rm in that
commit. Will it be possible for git status or rebase to give hint
that unmerged file was actually removed?
Rebase -i emitted used to write merge-recursive's conflict hints that said
"modify/delete", "modify/rename", "content", etc. I think that's what you
were looking for. But these hints have vanished since quite some time now.
I haven't taken the time, yet, to track down when this happened and why.
-- Hannes