mergetools / gvimdiff3on commit Merge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' (02f8203)
   1. "$MERGE_TOOLS_DIR/vimdiff"