I fixed it.
On Fri, Oct 25, 2013 at 10:05 AM, Jimmy Xiang <[EMAIL PROTECTED]> wrote:
> I am stuck on this file after rebase to trunk latest.
> # modified:
> My git auto changes this file a little due to CRLF issue. I could not
> ignore it.
> What should I do?