mergetools / gvimdiff3on commit Merge branch 'mh/config-flip-xbit-back-after-checking' (a633732)
   1. "$MERGE_TOOLS_DIR/vimdiff"