mergetools / gvimdiff3on commit Merge branch 'jc/checkout-local-track-report' (da178ac)
   1. "$MERGE_TOOLS_DIR/vimdiff"