[issue1032] fetch triggers merge program windown to pop up

[cnguyencasj]

New submission from cnguyencasj <cnguyencasj at gmail.com>:

I configured the kdiff3 merge program in my ~/.hgrc:
merge = /Applications/kdiff3.app/Contents/MacOS/kdiff3

This causes the kdiff3 window to pop up everytime I fetch the changesets from
the server for most of changed files.  Most of the times there are no conflict
changes but the kdiff3 window still pops up.  If I comment it out from the .hgrc
then the non-conflict merges when through smoothly.

----------
messages: 5590
nosy: cnguyencasj
priority: bug
status: unread
title: fetch triggers merge program windown to pop up

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1032>
____________________________________________________