mergetools / gvimdiff2on commit Merge branch 'jk/subtree-do-not-push-if-split-fails' (feffa04)
   1. "$MERGE_TOOLS_DIR/vimdiff"