~gandelman-a/ubuntu/raring/tarmac/local_usage

Viewing all changes in revision 405.

  • Committer: Tarmac
  • Author(s): James Westby
  • Date: 2013-02-04 21:07:18 UTC
  • mfrom: (398.4.2 lock-contention)
  • Revision ID: tarmac-20130204210718-sax4pk4v87t59cfs
Ignore LockContention errors when trying to merge a branch.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: