~mars/tarmac/fix-merge-error-updates-proposals

Viewing all changes in revision 386.

  • Committer: Maris Fogels
  • Date: 2010-12-02 01:54:11 UTC
  • Revision ID: maris.fogels@canonical.com-20101202015411-jr3i37ov1el5r5iy
Added a test to check that plugin merge errors are correctly handled by the merge command.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: