mergetools / gvimdiff2on commit Merge branch 'fc/makefile' (854afac)
   1. "$MERGE_TOOLS_DIR/vimdiff"