/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/command/resolve.py

  • Committer: Tim Marston
  • Date: 2014-03-19 20:02:10 UTC
  • Revision ID: tim@ed.am-20140319200210-b6nm63rpktfmw0l3
changed working of output

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/resolve.py
92
92
                # check for conflicts in repo
93
93
                files = the.repo.vcs.get_conflicts()
94
94
                if files:
95
 
                        message += 'Conflicts in %s:\n  %s' % \
 
95
                        message += 'conflicts in %s:\n  %s' % \
96
96
                                           ( the.repo.name, '\n  '.join( files ) )
97
97
 
98
98
                # check for deployment conclicts
99
99
                conflicts = deployment.get_conflicts()
100
100
                if conflicts:
101
 
                        message += 'Deployment conflicts:\n  %s' % \
 
101
                        message += 'deployment conflicts:\n  %s' % \
102
102
                                           '\n  '.join( conflicts )
103
103
 
104
104
                # stop if there are conflicts