Index: usr.sbin/freebsd-update/freebsd-update.sh
===================================================================
--- usr.sbin/freebsd-update/freebsd-update.sh
+++ usr.sbin/freebsd-update/freebsd-update.sh
@@ -2455,6 +2455,12 @@
 			EOF
 			read dummy </dev/tty
 			${EDITOR} `pwd`/merge/new/${F} < /dev/tty
+			# Verify that file was indeed resolved
+			if diff -U0 merge/old/${F} merge/new/${F} |
+			    grep -qE '^\+<+ current version$'; then
+				echo "Unresolved conflicts still exist in '${F}'. Giving up."
+				return 1
+			fi
 		done < failed.merges
 		rm failed.merges