[scm-migration-dev] [Bug 301] Mercurial issue 636: merge may use the wrong file contents for a file merge

[bugzilla-dae...@np.grommit.com]

http://bugs.grommit.com/show_bug.cgi?id=301


mike.kupfer at sun.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |fixesupstream




------- Comment #1 from mike.kupfer at sun.com  2007-11-02 16:39 PDT -------
fixed in 0.9.5


-- 
Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.