Lightlines
By jssblck

resolve-pr-conflicts

jssblck646 installs

Resolve PR conflicts without merging the PR.

Recent revisions are kept. Restoring one creates a new revision.