~jelmer/brz/plugin-git-references

Viewing all changes in revision 7318.

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-16 17:53:32 UTC
  • mfrom: (7317.1.6 resolve-auto-refactor)
  • Revision ID: breezy.the.bot@gmail.com-20190616175332-6l89f46neg5d5mjj
Create a new kind of conflict resolution action named 'auto'.

Merged from https://code.launchpad.net/~jelmer/brz/resolve-auto-refactor/+merge/368872

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: