commit your changes or stash them before you can merge - I didn't change anything :-(

[Siju George]

On Thu, May 20, 2010 at 7:42 PM, Pierre Abbat <phma at phma.optus.nu> wrote:
>
> I've gotten that when updating the source after applying a kernel patch. I
> just deleted the patched file.
>

I wonder how my file changed. I never applied the patch or knew such a
file existed to change it :-(

--Siju