Add "[S]kip all" conflict resolution option

Thanks to Miodrag Tokić (a.k.a.  loonies).
Merge branch 'add-skip-all'

Added "[S]kip all" conflict resolution option.  Thanks to Miodrag
Tokić (a.k.a. loonies).
Fix parsing of ":cmd &|cmd" pattern on the cmdline
Merge branch 'fix-parsing-of-space-bg-bar'

Fix parsing of ":cmd &|cmd" pattern on the command-line.