mergetools / gvimdiff3on commit notes: add notes.mergeStrategy option to select default strategy (d2d68d9)
   1. "$MERGE_TOOLS_DIR/vimdiff"