mergetools / gvimdiff3on commit Merge branch 'ar/t4150-am-scissors-test-fix' (2c8c407)
   1. "$MERGE_TOOLS_DIR/vimdiff"