mergetools / gvimdiff2on commit sequencer (rebase -i): allow continuing with staged changes (9d93ccd)
   1. "$MERGE_TOOLS_DIR/vimdiff"