Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/transaction.py @ 94:7daef883134f
Refactor merge code
Delete old code
Fix calculation of newer nodes on server
Fix branch recursion on client
Fix manifest merge problems
Add more debugging and note messages to merge
| author | mpm@selenic.com |
|---|---|
| date | Wed, 18 May 2005 16:29:39 -0800 |
| parents | 42177b56b949 |
| children | 589f507bb259 |