~matsubara/tarmac/tarmac-bug-418823

Viewing all changes in revision 148.

  • Committer: Tarmac
  • Author(s): Rodney Dawes
  • Date: 2009-09-04 15:27:37 UTC
  • mfrom: (143.3.2 failed-merge-status)
  • Revision ID: paul@eventuallyanyway.com-20090904152737-nd3aan4gdh5f4e1f
Better format for the merge failure comment message. (Rodney Dawes)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: