~ubuntuone-hackers/tarmac/jenkaas

Viewing all changes in revision 456.

  • Committer: Vincent Ladeuil
  • Date: 2016-09-06 10:44:51 UTC
  • Revision ID: vila+ols@canonical.com-20160906104451-7cyk8vxz1qqkkmbn
Fix the edge case where the merge introduces changes that are overridden remotely.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: