[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: |
Stefan Monnier |
Subject: |
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts |
Date: |
Fri, 03 Feb 2012 14:32:38 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
>> > 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.
So you're saying that hg uses standard conflict markers in its
internal:merge code? Wonderful.
>> Actually I guess vc-hg would need some changes too.
> Yep, I guess you'd need changes on both ends.
Apparently only vc-hg.el needs to be changed, then.
Stefan
bug#10709: Feature request: vc-hg should activate smerge-mode for conflicts, Stefan Monnier, 2012/02/03