[PATCH V2] rebase: fix --collapse when a file was added then removed

[Durham Goode]

On 3/18/13 1:46 PM, "Bryan O'Sullivan" <bos at serpentine.com> wrote:

>
>On Fri, Mar 15, 2013 at 1:34 PM, Durham Goode <durham at fb.com> wrote:
>
>But if this is a temporary fix, what will a non-temporary fix look like?
>

The 'temporary fix' comment was there already from whoever added that
parameter originally.  I don't consider my fix temporary.  I just adjusted
the comment to mention my new use case as well.

That said, the merge code could use a bit of refactoring so we don't have
to keep adding parameters whenever we need the behavior to change in
particular cases.