Can't launch DiffMerge to resolve conflicts

Question

Just started getting the following error when using the command Launch External Merge Tool.

DiffMerge gives me the error:

File (./inner.html.BASE.13191.html) not found.

But I can see these three files being created in the directory:

inner.html.BACKUP.13191.html

inner.html.LOCAL.13191.html

inner.html.REMOTE.13191.html

Using the following:

SourceTree v1.4.4.2

DiffMerge 3.3.2

Mac OS 10.6.8

alexroper · Accepted Answer

Thanks. I think I figured out I had restarted a merge on that file that didn't have any conflicts. Which then flagged it as having conflicts even tho it didn't. So, yes I think the file was missing on one side of the merge.

I eventually resolved it manually, but it would be nice if there was some kind of warning about this before it tried to send it to the external merge application.