diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-14 16:54:31 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-14 16:54:31 +0000 |
| commit | e8fdfa8dd233fb70f2e3dc4d74cd6a30785bdd04 (patch) | |
| tree | b1c557dad8bd001ddad309fb329727f5bd004f4b | |
| parent | 7f5045a678d2b2a938c57f786382c537314e1b43 (diff) | |
| download | tbdiff-e8fdfa8dd233fb70f2e3dc4d74cd6a30785bdd04.tar.gz | |
fixup baserock-system-config-sync explanation table
| -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 e768a3a..0a35ada 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -128,7 +128,7 @@ merge_regular_file() { # none none exists use V2 # exists none exists use V2 # exists exists none use Vuser - # none exists exists diff V2 Vuser applied to V2 + # none exists exists diff V2 Vuser applied to V2 (use Vuser) # exists exists exists diff V1 Vuser applied to V2 v1_exists=$(test -f "$v1" && echo exists || echo none) |