diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-13 18:36:46 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-14 12:24:27 +0000 |
| commit | 72e8e410dd56ede0be5a906e36ea6d01bebadf18 (patch) | |
| tree | 3d11f809826288d9f04252c4e9a77cdb02c9aac8 | |
| parent | c9059ab4cda29b65111c67bb7251dd37b83bf8f6 (diff) | |
| download | tbdiff-72e8e410dd56ede0be5a906e36ea6d01bebadf18.tar.gz | |
Fix behaviour in the comments
| -rwxr-xr-x | baserock-system-config-sync/baserock-system-config-sync | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index cb5984d..6fc86cd 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -127,7 +127,7 @@ merge_regular_file() { # none exists none use Vuser # none none exists use V2 # exists none exists use V2 - # exists exists none use V2 + # exists exists none use Vuser # none exists exists diff V2 Vuser applied to V2 # exists exists exists diff V1 Vuser applied to V2 |