/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/vcs/vcs.py

  • Committer: Tim Marston
  • Date: 2016-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/vcs/vcs.py
22
22
class Vcs:
23
23
 
24
24
 
25
 
        vcses = [ 'brz' ]
 
25
        vcses = [ 'bzr' ]
26
26
 
27
27
 
28
28
        @staticmethod