Mercurial > hg
diff mercurial/manifest.py @ 18035:5881d5b7552f
merge: refactor action calculation into function
This pulls the code used to calculate the changes that need to happen
during merge.update() into a separate function. This is not useful on
its own, but is instead preparatory to performing grafts in memory
when there are no potential conflicts.
| author | David Schleimer <dschleimer@fb.com> |
|---|---|
| date | Tue, 04 Dec 2012 12:54:18 -0800 |
| parents | c64e646af81e |
| children | a1141f04e368 |