Mercurial > hg
comparison hgmerge @ 992:f859e9cba1b9
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
author | mpm@selenic.com |
---|---|
date | Mon, 22 Aug 2005 01:22:29 -0700 |
parents | 9c918287d10b |
children | 696851b1bba9 |
comparison
equal
deleted
inserted
replaced
991:b634b15c020b | 992:f859e9cba1b9 |
---|