/breezy/3.0

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/3.0

Viewing all changes in revision 6950.

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-06 00:18:25 UTC
  • mfrom: (6947.2.1 merge-modified)
  • Revision ID: breezy.the.bot@gmail.com-20180506001825-39izi7tauf7lu8w5
Don't expect unmodified files to be removed when a merge is reverted on working trees that don't support merge_modified.

Merged from https://code.launchpad.net/~jelmer/brz/merge-modified/+merge/345133

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: