From 559409a880f91b7d641092c3f8226f893a487a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 29 Jun 2012 11:38:11 +0200
Subject: [PATCH] - language change from OBS special to standard SCM
 terminilogy

---
 osc/core.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osc/core.py b/osc/core.py
index ea4dedcb..22c9f394 100644
--- a/osc/core.py
+++ b/osc/core.py
@@ -1830,7 +1830,7 @@ rev: %s
         print
         print "The link in this package is currently broken. Checking"
         print "out the last working version instead; please use 'osc pull'"
-        print "to repair the link."
+        print "to merge the conflicts."
         print
 
     def unmark_frozen(self):