diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-20 18:34:46 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-02-26 14:23:09 +0000 |
| commit | 0578cae3dfab3ff70a7c8f7028843cfd4b1592b8 (patch) | |
| tree | 22ff1c9e705b4b89cc8809c948766745d5b04501 | |
| parent | 2c251e0aea25c12c8faa3a12931142c96822870d (diff) | |
| download | tbdiff-0578cae3dfab3ff70a7c8f7028843cfd4b1592b8.tar.gz | |
Fix error in the baserock-system-config-sync behaviour table
| -rwxr-xr-x | baserock-system-config-sync/baserock-system-config-sync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index e3fd181..4631ad4 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2013 Codethink Ltd. +# Copyright (c) 2013-2014 Codethink Ltd. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License Version 2 as @@ -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 |