/stdhome : revision 71

Committer: Tim Marston
Date: 2016-04-10 20:17:32 UTC
Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9

To get this branch, use:

bzr branch
http://bzr.ed.am/stdhome

added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

added added

removed removed