Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ancestor.py @ 3309:488d3062d225
merge: eliminate nodes from action list
- eliminate my and other from merge and copy
- eliminate node from get
- use mctx for get
- fix bug flag = a[2:]
- pass mctx to recordupdates
- use new filectx.size in recordupdates
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 09 Oct 2006 23:23:25 -0500 |
| parents | b1db258e875c |
| children | eb0b4a2d70a9 |