Hello Yuya,
Thanks for reply. As you suggest, I post the query regarding to merge in
BitBucket forum.
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.
Please suggest.
Regards
Utsavi Bharuchwala
------------------------------------------------------------------------------
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
