On Wed, Jun 10, 2009 at 9:58 AM, Georg<gwk....@googlemail.com> wrote: > Not sure what you are asking. I did hgtk merge -r v14, confirmed to merge > in the first dialog, the merge was performed with no conflict, then clicked > on commit. Upon closing, another window with the stack trace below came up.
the stack trace was caused by the commit tool trying to show diffs to the second parent after the merge commit. Normally, after a merge commit there are no files left to be diffed because we commit the entire repository. -- Steve Borho ------------------------------------------------------------------------------ Crystal Reports - New Free Runtime and 30 Day Trial Check out the new simplified licensing option that enables unlimited royalty-free distribution of the report engine for externally facing server and web deployment. http://p.sf.net/sfu/businessobjects _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
