New Vim script for P4 merge.