mergetools / gvimdiff2on commit sequencer: offer helpful advice when a command was rescheduled (cb5206e)
   1. "$MERGE_TOOLS_DIR/vimdiff"