mergetools / gvimdiff2on commit Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint (0175b6e)
   1. "$MERGE_TOOLS_DIR/vimdiff"