Stefan Sperling:

> The "different content" check for deletions is supposed to be a
> safe-guard in cases where comnands such as rebase, merge, cherrypick,
> and backout delete files. If file content is not 100% the same then
> we cannot assume that the file being deleted is the "same".

Absolutely.  If I have a branch that deletes files and I rebase it,
I want a conflict if the contents of those files are different.

In fact that is my situation.  The files have changed, and I add a
commit that reverts those changes, and then rebase the branch on
top.  Which works fine.  But afterwards, I would like to fold the
revert commit into the rebased branch.

> However, your histedit situation is a different use case.

Yes.  How doas the "different content" check even apply to a folding
operation??

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de