Mercurial > hg
comparison mercurial/httpconnection.py @ 17045:52ea9ce5b641 stable
graft: don't drop the second parent on unsuccessful merge (issue3498)
This replicates the strategy of rebase, which postpones setparents and
duplicatecopies after checking the merge stats.
Without the second parent, resolve cannot redo merge.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 16 Jun 2012 17:05:55 +0900 |
| parents | a814f8fcc65a |
| children | 72803c8edaa4 |
comparison
equal
deleted
inserted
replaced
| 17041:86a3bb9c5f5c | 17045:52ea9ce5b641 |
|---|