On Sat, 16 Sep 2017 15:18:48 +0530, utsavi bharuchwala wrote:
> Thanks for reply. As you suggest, I post the query regarding to merge in
> BitBucket forum.
Ugh, I meant you could push an example repository to bitbucket, in which
the problem can be reproduced.
> Can you tell me the steps to solve the merge conflict using mercurial
> resolver?
>
> I am currently using KDIFF3 to resolve the merge conflict.
>
> Note: I am using the merge command as you suggested in terminal window.
Maybe you've lost the context. What we're trying is to get why "hg merge
-t :fail" command run in Merge Dialog does not detect conflicts, right?
1. Merge Dialog (which run "hg merge --tool :fail --verbose") didn't
actually merge
2. "hg merge --tool :fail --debug" in cmd.exe worked
So the next step is to test the same command in TortoiseHg Console.
BTW, which TortoiseHg version are you using?
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Tortoisehg-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
