Mercurial > hg
diff mercurial/simplemerge.py @ 21671:b510de5cd5e9
memctx: remove p1 since it is now inherited
author | Sean Farley <sean.michael.farley@gmail.com> |
---|---|
date | Thu, 15 Aug 2013 15:06:10 -0500 |
parents | 4aeb7a6029ba |
children | f18830651811 |