[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#10709: Feature request: vc-hg should activate smerge-mode for confli
|
From: |
Wolfgang Schnerring |
|
Subject: |
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts |
|
Date: |
Fri, 3 Feb 2012 19:27:36 +0100 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
* Glenn Morris <rgm@gnu.org> [2012-02-03 12:11]:
> Glenn Morris wrote:
> > I guess you need to get hg to generate standard conflict markers. Ref:
You could configure diff3 as the default merge program.
However, in my experience, using smerge-mode on the "internal:merge"
results of hg worked, too.
> Actually I guess vc-hg would need some changes too.
Yep, I guess you'd need changes on both ends.
Wolfgang
signature.asc
Description: Digital signature
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts, Stefan Monnier, 2012/02/03