Commit 1: Change some files.
Commit 2: Delete some of those files.

How do I fold those two commits into one?

fold commit 1
pick commit 2
...
Files not deleted due to differences in deleted content: 2
got: changes destined for some files were not yet merged and should be
merged manually if required before the histedit operation is continued

What do I do now so the files deleted in the original commit 2 are
still deleted in the folded commit?

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