diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..026a600 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +OUTPUT diff --git a/BASE b/BASE new file mode 100644 index 0000000..0ae6ff0 --- /dev/null +++ b/BASE @@ -0,0 +1,9 @@ +twas bri1lig, and the slithy toves +did gyre and gimble in the wabe +all mimsy were the borogroves +and the m0me raths outgabe. + +"Beware the Jabberwock, my son! +The jaws that bite, the claws that catch! +Beware the Jub jub bird, and shun +The frumious bandersnatch!" \ No newline at end of file diff --git a/LEFT b/LEFT new file mode 100644 index 0000000..11875fc --- /dev/null +++ b/LEFT @@ -0,0 +1,9 @@ +twas brillig, and the slithy toves +Did gyre and gimble in the wabe: +all mimsy were the borogoves, +And the mome raths outgrabe. + +"Beware the Jabberwock, my son! +The jaws that bite, the claws that catch! +Beware the Jubjub bird, and shun +The frumious Bandersnatch!" \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..f3c016a --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +# Cursive & `idea merge`/`idea diff` bug reproducer + +To reproduce, clone this repository and run: + +``` +$ idea diff LEFT RIGHT +``` + +or: + +``` +$ idea merge LEFT RIGHT BASE OUTPUT +``` diff --git a/RIGHT b/RIGHT new file mode 100644 index 0000000..75d5bd2 --- /dev/null +++ b/RIGHT @@ -0,0 +1,9 @@ +'Twas brillig, and the slithy toves +Did gyre and gimble in the wabe: +All mimsy were the borogroves +And the mome raths outgabe. + +"Beware the Jabberwock, my son! +The jaws that bite, the claws that catch! +Beware the Jub jub bird, and shun +The frumious bandersnatch!" \ No newline at end of file