Mercurial > hg
comparison tests/test-treemanifest.t @ 26949:b639b2f186bf
merge.applyupdates: only attempt to merge files in mergeactions
This only makes a difference when a merge driver is active -- in that case we
don't want to try and merge all the files, just the ones still unresolved after
the merge driver's preprocess step is over.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 12 Nov 2015 14:29:02 -0800 |
| parents | 4d1a96bb831f |
| children | d9bfe6289acf |
comparison
equal
deleted
inserted
replaced
| 26948:067ab07435c9 | 26949:b639b2f186bf |
|---|