mergetools / gvimdiff2on commit Merge branch 'jc/denoise-rm-to-resolve' (5e9d978)
   1. "$MERGE_TOOLS_DIR/vimdiff"