mergetools / gvimdiffon commit Merge branch 'rs/pickaxe-simplify' (d5a3897)
   1. "$MERGE_TOOLS_DIR/vimdiff"