New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for perforce conflict markers #111

Open

kshenoy opened this issue Apr 28, 2016 · 0 comments

kshenoy commented Apr 28, 2016

Hi, would it be possible to add support for the conflict markers used by Perforce?

>>>> ORIGINAL
==== THEIRS
==== YOURS
<<<<

ORIGINAL refers to base, THEIRS to remote and YOURS to local.

Thanks

The text was updated successfully, but these errors were encountered:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment