A more recent version of filename is on this branch. Do you want to merge the file now?
Although you are prompted to check in the file after the merge, consider verifying the merge results (for example, by opening the file and viewing its contents) before checking in the file.
If you do not merge the latest version with your changes, you cannot check in your version of the file on the branch currently specified by your config spec.
Forces the Diff Merge tool to start during the merge and disables automatic merge. Set this option so that you can complete the merge through the graphical user interface, even if the merge is trivial and does not require your input.