Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 2875:3d6efcbbd1c9
remove localrepository.changes.
use localrepository.status instead.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Sat, 12 Aug 2006 16:40:12 -0700 |
| parents | b11c014dcbd9 |
| children | bee4b7abcb01 |
line wrap: on
line diff
--- a/mercurial/merge.py Sat Aug 12 16:13:27 2006 -0700 +++ b/mercurial/merge.py Sat Aug 12 16:40:12 2006 -0700 @@ -75,7 +75,7 @@ raise util.Abort(_("update spans branches, use 'hg merge' " "or 'hg update -C' to lose changes")) - modified, added, removed, deleted, unknown = repo.changes() + modified, added, removed, deleted, unknown = repo.status()[:5] if branchmerge and not forcemerge: if modified or added or removed: raise util.Abort(_("outstanding uncommitted changes"))