What steps will reproduce the problem? 1. I am merging my trunk on a feature branch 2. First merges are OK 3. then there is a conflict 4. the workspace is reverted and updated 5. a 'svn status --xml' command is launched, it show the file added by successfull merges as "unversioned" 6. then the NPE

What is the expected output? What do you see instead? Caught: java.lang.NullPointerException: Cannot invoke method put() on null object at SvnMergeTool.launchSvnMerge(jigomerge-2.2.2.groovy:121) at SvnMergeTool.main(jigomerge-2.2.2.groovy:479)

What version of the product are you using? On what operating system? 2.2.2 - GNU/Linux Ubuntu 10.10 amd64

Please provide any additional information below. I run jigomerge with just the url, the username and the password as arguments. All others are defaults

Please feel free to ask more pieces of information if needed

Fixed by added :

result.conflictingFiles = [:]

on ligne 63

Thanks for the patch :)