Mercurial > hg
comparison mercurial/merge.py @ 42012:9b78bbb76111
shelve: refactor _shelvecreatedcommit's match object into calling site
We might need to use this match object again to move the dirstate in
case the user requested to `--keep` the changes.
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Fri, 22 Mar 2019 13:03:26 -0400 |
| parents | aaad36b88298 |
| children | 02fa567f8a3c |
comparison
equal
deleted
inserted
replaced
| 42011:22278dae287c | 42012:9b78bbb76111 |
|---|