On Wed, Jun 12, 2013 at 03:04:56PM +0200, Johan Corveleyn wrote: > Okay, but doesn't "postpone" still needs to have a well defined > behavior (and probably "as good as possible"), even if only for > supporting the --accept=postpone command line option?
What is "as good as possible"? The --accept postpone option (or equivalent menu option) simply leaves the conflicted node as-is. I don't think we can make the incoming edit visible without updating the moved file.
