RE: basic Mercurial merge “conflicts” tool

[BOGGESS Rod CORE]

From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Pietro Moras
Sent: Tuesday, February 04, 2014 12:32 PM
To: mercurial at selenic.com
Subject: RE: basic Mercurial merge “conflicts” tool

Well, frankly I was simply thinking about something like a:
[ui]
merge = internal:merge
into the Mercurial.ini file. Your thoughts welcome. Thanks!
 - P.M.

Oh. Ok, well, I keep my options open. Instead of defining a single merge tool in the [ui] section, I have a [merge-tools] section. I also added a [merge-patterns] section because windows defaults to UTF16, which mercurial interprets as a binary file. Here’s a copy of the two relevant sections. Hope it helps.

[merge-tools]
#This is already configured in Tortoise, but if you ever run Mercurial from the
#command line, it needs re-defined here. Otherwise, this can be left out.
kdiff3.priority=-3
kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
kdiff3.regkeyalt=Software\Wow6432Node\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=False
kdiff3.premerge=False
kdiff3.gui=True
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
kdiff3.dirdiff=True

[merge-patterns]
#Force merges for known text types.
**.c=kdiff3
**.cpp=kdiff3
**.cs=kdiff3
**.h=kdiff3
**.hpp=kdiff3
**.vb=kdiff3
**.vcxproj=kdiff3
**.vcproj=kdiff3
**.resx=kdiff3
**.xml=kdiff3
**.txt=kdiff3
**.manifest=kdiff3
**.myapp=kdiff3
**.settings=kdiff3
**.config=kdiff3
**.sql=kdiff3
#Force merge failure for known file types.
**.exe=internal:fail
**.dll=internal:fail


And here’s another example that does define it in the [ui] section, here using tortoisemerge from subversion: http://webcache.googleusercontent.com/search?q=cache:aNYT-Rxg1MUJ:www.prolificnotion.co.uk/customising-your-mercurial-ini-configuration-file/+&cd=5&hl=en&ct=clnk&gl=us







[Tenova]

<http://www.tenova.com>

<http://http://www.tenova.com>

Tenova: advanced technologies for the metals and mining industries
Visit our website at www.tenova.com<http://www.tenovagroup.com/>

________________________________

Confidentiality Notice : This message, together with its attachments, contains strictly confidential information and is intended only for the addressee identified above, who is the sole party authorized to use and copy it and, assuming any related liability , to forward it to others. Anyone receiving this message by mistake or reading it without authorization is hereby notified that storage, reproduction, disclosure or distribution of the message to persons other than the addressee is strictly forbidden. They are asked to return the message immediately to the sender and to erase the original message received.
Thank you.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140204/ea57e7ee/attachment-0002.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: imaged6d2e0.JPG
Type: image/jpeg
Size: 16909 bytes
Desc: imaged6d2e0.JPG
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140204/ea57e7ee/attachment-0002.jpe>