Stefan Sperling wrote on Wed, Nov 17, 2010 at 14:09:47 +0100: > Note that you could also use the --accept="theirs-full" option to skip the > interactive prompt. >
In trunk, '--accept=tf' (using the shorthands from the interactive resolver) also works. I've nominated the shorter spelling for 1.6.14. Thanks for the reminder.
