-
-
Save astrolemonade/86e748c727990681ec1550862353e3f7 to your computer and use it in GitHub Desktop.
git conflicts parsing as Scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
object main extends App { | |
object <<<<<<< { | |
def HEAD(s: String) = this | |
} | |
implicit class StringOps(s: String) { | |
def =======(i: Int) = s | |
def >>>>>>>(i: Int) = i | |
} | |
val git1 = 42 | |
val a = 10 | |
println( | |
<<<<<<< HEAD | |
"qux" | |
======= | |
"bar" | |
>>>>>>> git1-a | |
) | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment