#
#
# patch "maybe_workspace_updater.cc"
#  from [533b26f15fd2b160aaf9c2559877e754242c6fc7]
#    to [fadfa9fbc54902bffab84ea1b66a5caf190b1e2c]
# 
# patch "tests/resolve_conflicts_all_resolutions/merge-1"
#  from [8c59629b74fbb69e4f01b703a3e5f18fcd7a3cb5]
#    to [966446270b4e33f40298398f39eba962236fa8df]
# 
# patch "tests/resolve_conflicts_content/merge-1"
#  from [f25a8a6d4928ed2ff4c6101d6003e823842df02d]
#    to [eaae4c9145e686cd082dea54e19d6554363aaa29]
# 
# patch "tests/resolve_conflicts_duplicate_name/merge-1"
#  from [69adf7cdcaf299e0f803bd88e56658e8119f2cd1]
#    to [69b6b13be1a3467990563ac4a6a8fdf539bf6df0]
# 
# patch "tests/resolve_conflicts_none/merge-1"
#  from [e318ce7db05cb468438a03b2612966e370a014fd]
#    to [340300e991f4802e902e22ceb1ffa8db5158d798]
# 
# patch "tests/resolve_conflicts_propagate/propagate-1"
#  from [a06cdf3cda8349b8dac49e81f63e256755a0dd68]
#    to [99661c3e202ac5aac6f6bb93eb708a73f4c44278]
# 
# patch "tests/resolve_conflicts_propagate/propagate-2"
#  from [fc22f5cce910a723c5fe3eee405d9750c172f000]
#    to [a0b6a8000ff7604ea3d1d3ec795543fc823bb43e]
#
============================================================
--- maybe_workspace_updater.cc	533b26f15fd2b160aaf9c2559877e754242c6fc7
+++ maybe_workspace_updater.cc	fadfa9fbc54902bffab84ea1b66a5caf190b1e2c
@@ -61,7 +61,7 @@ void maybe_workspace_updater::maybe_do_u
     }
   else
     {
-      P(F("note: your workspaces have not been updated"));
+      P(F("note: your workspace has not been updated"));
     }
 }
 
============================================================
--- tests/resolve_conflicts_all_resolutions/merge-1	8c59629b74fbb69e4f01b703a3e5f18fcd7a3cb5
+++ tests/resolve_conflicts_all_resolutions/merge-1	966446270b4e33f40298398f39eba962236fa8df
@@ -14,4 +14,4 @@ mtn: [merged] 6363bd08ae08d7e57067ba6476
 mtn: merged simple_file, simple_file
 mtn: replacing content of user_file, user_file with resolutions/user_file
 mtn: [merged] 6363bd08ae08d7e57067ba6476f76417c72f1a25
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_content/merge-1	f25a8a6d4928ed2ff4c6101d6003e823842df02d
+++ tests/resolve_conflicts_content/merge-1	eaae4c9145e686cd082dea54e19d6554363aaa29
@@ -7,4 +7,4 @@ mtn: [merged] d18cecd65445fa5b10732c6ca8
 mtn: replacing content of files/baz, files/baz with _MTN/result/baz
 mtn: replacing content of files/foo, files/foo with files/foo
 mtn: [merged] d18cecd65445fa5b10732c6ca8a8bbdac2a6610a
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_duplicate_name/merge-1	69adf7cdcaf299e0f803bd88e56658e8119f2cd1
+++ tests/resolve_conflicts_duplicate_name/merge-1	69b6b13be1a3467990563ac4a6a8fdf539bf6df0
@@ -8,4 +8,4 @@ mtn: [merged] 14964233a7361ada1ba962f786
 mtn: renaming thermostat.c to thermostat-westinghouse.c
 mtn: renaming thermostat.c to thermostat-honeywell.c
 mtn: [merged] 14964233a7361ada1ba962f7863d4fee12f30df7
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_none/merge-1	e318ce7db05cb468438a03b2612966e370a014fd
+++ tests/resolve_conflicts_none/merge-1	340300e991f4802e902e22ceb1ffa8db5158d798
@@ -4,4 +4,4 @@ mtn: [merged] 7f38dd536c4f995a4a7ccd788d
 mtn: [left]  bcd098b31f9ed42acfb5ab550c973e7d8f7203fd
 mtn: [right] c28c3c0f5a7f9cde848be91f79d86a6dd63e88ca
 mtn: [merged] 7f38dd536c4f995a4a7ccd788d2b5be2755805cf
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_propagate/propagate-1	a06cdf3cda8349b8dac49e81f63e256755a0dd68
+++ tests/resolve_conflicts_propagate/propagate-1	99661c3e202ac5aac6f6bb93eb708a73f4c44278
@@ -6,4 +6,4 @@ mtn: [merged] a74c964afba9c299c81ec404e5
 mtn: renaming thermostat.c to thermostat-westinghouse.c
 mtn: renaming thermostat.c to thermostat-honeywell.c
 mtn: [merged] a74c964afba9c299c81ec404e5233ad6faffadc1
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_propagate/propagate-2	fc22f5cce910a723c5fe3eee405d9750c172f000
+++ tests/resolve_conflicts_propagate/propagate-2	a0b6a8000ff7604ea3d1d3ec795543fc823bb43e
@@ -2,4 +2,4 @@ mtn: no merge necessary; putting a74c964
 mtn: [left]  a74c964afba9c299c81ec404e5233ad6faffadc1
 mtn: [right] 1337cb1059c4bc3e376b14381b43e9383c654da1
 mtn: no merge necessary; putting a74c964afba9c299c81ec404e5233ad6faffadc1 in branch 'abe_branch'
-mtn: note: your workspaces have not been updated
+mtn: note: your workspace has not been updated