~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

- improved eta estimation for progress bar
  (patch from John Arbash Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context: