~tarmac-control-tower/tarmac/main

Viewing all changes in revision 329.

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2010-08-05 16:20:43 UTC
  • mfrom: (328.1.2 unapproved-revisions-comment)
  • Revision ID: paul@eventuallyanyway.com-20100805162043-jwwh23628dlsanmw
Unify error handling for merge failure or rejection
Add UnaprovedChanges exception for when tip is newer than approved revision

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: