Support changed path to DiffMerge. Closes #2454