mergetools / gvimdiff2on commit Merge branch 'rr/diffcore-pickaxe-doc' (71e1202)
   1. "$MERGE_TOOLS_DIR/vimdiff"