v0.1.3: PreservePaths + per-conflict resolver#5

StuartMeeks merged 1 commit intomainStuartMeeks/NextIteration.SpectreConsole.SelfUpdate:mainfrom

preserve-paths-and-conflictsStuartMeeks/NextIteration.SpectreConsole.SelfUpdate:preserve-paths-and-conflictsCopy head branch name to clipboard