Applies to v3.3.8
I had a case where P4Merge was called to resolve a conflict in a too large .js file and it hung in the background. It seemed like nothing had happened so I attempted to resolve again, but got a warning that attempting to use P4Merge on such a large file could cause P4Merge to hang. I opted to not launch the external merge tool. Not having a clear picture what was in my local file, I committed the changes. Also, the file status filter was set to "Modified" so I didn't notice the untracked conflict files.

There are multiple areas for improvement here.
1. Detect when external merge tool fails to release conflict files and provide a warning
2. Check for presence of unresolved merge conflict files, esp. for recent conflict resolution attempts
3. Make "unstaged changes" more visible