Handling if's with parenthesis
Giorgos Keramidas
keramida at ceid.upatras.gr
Fri Dec 5 15:10:01 UTC 2008
On Fri, 5 Dec 2008 16:25:44 +0200, "E.L.K." <some.any.key at gmail.com> wrote:
>> The behaviour you see is works-as-designed - see
>> http://www.selenic.com/mercurial/bts/issue1295 msg7160. Your case is a
>> variant of the example in msg7101.
>>
>> You can fix that by disabling premerge for your merge tool - see
>> http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration .
>
> Is there any way to globally still do premerging for files, which was
> changed only by one head, but disable for files, which have changes
> from booth heads in merging operation?
That should be the default. When there are only changes in *one* head,
Mercurial will pick the changes as they don't conflict. When there are
changes in both heads, then premerge is optionally done and the merge
tool is launched.
More information about the Mercurial
mailing list