Getting weird output on merge conflict

[Dave Sky]

I've dealt with merge conflicts on command-line, GitHub for Windows, and Git Extensions, but not in SourceTree (and I'm using it for Mac now), and I can't tell if what I'm looking at is a bug or something else.

The first character on each line in "Hunk 2" are showing in green in the same column as the plus symbol (+)... I'm having trouble merging or fixing a conflict, so I reverted and looked at one of the commits having a conflict, and the changes made (deletions) show in red but then the first character of each line also show in the same column as the minus symbol (-) in red. I'm not making sense of this.

Do I need to reinstall SourceTree or is this a bug or what?

[Manju]

That seems like an odd bug. Can you please submit a ticket with the patch for us to load the same diff to locally reproduce on http://jira.atlassian.com/projects/SRCTREE/issues ?

Thanks!

[Dave Sky]

I can't give you proprietary company source code, but I could type up a fake Lasso script file as easily as you could to reproduce the results.

Do you want to try before requesting that I do it? You probably only need a few lines.