summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbaserock-system-config-sync/baserock-system-config-sync4
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 a1a4a85..f21f898 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