From 3ae45027783c90420579143bfbf72476ac232aea Mon Sep 17 00:00:00 2001
From: Marius Mauch <genone@gentoo.org>
Date: Wed, 19 Jul 2006 09:57:31 +0000
Subject: [PATCH] Show full path when auto-merging

svn path=/main/trunk/; revision=3929
---
 bin/etc-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/etc-update b/bin/etc-update
index 41def58a1..06ac3ddef 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -71,7 +71,7 @@ function scan() {
 					MATCHES=1
 				fi
 				if [[ "${MATCHES}" == "1" ]]; then
-					echo "Automerging trivial changes in: ${rfile:10}"
+					echo "Automerging trivial changes in: ${rpath}/${rfile:10}"
 					mv ${rpath}/${rfile} ${rpath}/${rfile:10}
 					continue
 				else
-- 
2.26.2