Motivating example does not work

[benedikt-schesch]

I reproduced the motivating example from the paper in https://github.com/benedikt-schesch/intellimerge-example but intellimerge does raise a merge conflict. Is that expected behavior or is there a bug?

[benedikt-schesch]

String collectedDir = System.getProperty("java.io.tmpdir") + "IntelliMerge2" + File.separator;
I have figured out that it didn't work on my computer because this needs to be merged more properly. Some systems return without a trailing '/' after calling 'System.getProperty("java.io.tmpdir")' which causes the system to try to create a rootdir which is not allowed and not recommended. I would leave the concatenation of paths to the File class to ensure platform independence and correctness:
String collectedDir = new File(System.getProperty("java.io.tmpdir"), "IntelliMerge2").getPath() + File.separator;