[PATCH] fix trunk test failure

Hi,

obviously something went wrong with the added test patch and currently
causes test failures with trunk.

Unfortunately I proposed and applied a previous version of the test code
which is buggy and runs the resolve command on the wrong path. The
attached patch corrects that:
automatic_binary_conflict_resolution_fix.patch and restores the test
code to the version I actually ran the tests with before proposing the
patch.

This will resolve the tests on the 1.9.x branch as well as on trunk <=
1722441.

However, the newly added test still fails with later trunk revisions. I
will need some more time to investigate which revision actually caused
the change (atm I traced it down to be some revision in between 1722441
(01/31/2016) and 1732848 (02/29/2016)). In order to restore the tests, I
suggest to apply the second patch which marks the newly added test as
XFail for the time being.

Regards,
Stefan