summaryrefslogtreecommitdiff
path: root/tests/bscs-merge.pass
Commit message (Expand)AuthorAgeFilesLines
* Allow replacing a file with a compatibility symlinkSam Thursfield2014-09-1925-0/+24
* Fix behaviour in bscs-merge when vUser and v2 don't have a file of v1Pedro Alvarez2014-03-051-2/+0
* Add test case for vu == v2 in 'baserock-system-config-sync'Pedro Alvarez2014-02-248-0/+16
* Modify the way to use 'patch' in 'baserock-system-config-sync'.Pedro Alvarez2014-02-201-0/+2
* Remove test mode and provide hooks to use a test suite.Tiago Gomes2013-07-01153-0/+1244