Mercurial > hg
comparison tests/test-simple-update.t @ 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 | f2719b387380 |
| children | 92bca12328d1 |
comparison
equal
deleted
inserted
replaced
| 18034:1a570f04de07 | 18035:5881d5b7552f |
|---|