Mercurial > hg
comparison mercurial/merge.py @ 24210:99362821b25b
subrepo: always return scmutil.status() from gitsubrepo.status()
This was accidentally left out of c95db3208a33.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 03 Mar 2015 21:24:16 -0500 |
| parents | 6becb9dbca25 |
| children | 1ff35d76421c |
comparison
equal
deleted
inserted
replaced
| 24209:6944b64cc28d | 24210:99362821b25b |
|---|