added new instructions for subl and p4diff/merge