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-21 09:59:20 +0000 |
| commit | fbd1a88e458ac08394879c7393485f62a02a7d3e (patch) | |
| tree | 65de6ee49df844bbfc3fa1b54a2c97a7dd19860a | |
| parent | bcfb17b890e74538655695c4f76962b16565f664 (diff) | |
| download | tbdiff-fbd1a88e458ac08394879c7393485f62a02a7d3e.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 a093b15..29cfdcf 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 |