[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] deferred merge
|
From: |
Hendrik Boom |
|
Subject: |
[Monotone-devel] deferred merge |
|
Date: |
Fri, 25 Mar 2016 23:46:03 -0400 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Is there some easy oe-time way of asking a merge to be deferred, so
that the "merged" file has both versions in it, complete with
'<<<<<<<<' and ">>>>>>>" and ssuch to mark the conflicts? Because
sometimes it takes a lot more analysis than is practical with the emacs
merge command.
-- hendrik
- [Monotone-devel] deferred merge,
Hendrik Boom <=