On Thu, Jun 5, 2008 at 2:51 AM, Peter Ruibal <[EMAIL PROTECTED]> wrote: > The original file was checked out in UNIX mode (opening with notepad shows > all 1 line). > > After editing the file, opening with notepad shows 1 line. > > After merging the file (on hg up, but before commit), opening with notepad > shows multiple lines. > > The graphical merge tool i'm using is "gpyfm," Was this part of thg or hg?
Neither hg nor thg provide an internal GUI merge tool. ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ Tortoisehg-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
