Viewing File: /home/ubuntu/code_review/arcanist/src/lint/linter/__tests__/mergeconflict/mergeconflict.lint-test

{
    "foo": "bar",
<<<<<<< HEAD
    "bar": "baz"
=======
    "baz": "foo"
>>>>>>> branch2
}
~~~~~~~~~~
error:5:1:MERGECONFLICT1:Unresolved merge conflict
Back to Directory File Manager