Show full path when auto-merging

svn path=/main/trunk/; revision=3929

diff --git a/bin/etc-update b/bin/etc-update
index 41def58a1f8e48f74af342c72e89deebdd83d47e..06ac3ddefa92ed81e94d9a35e995b2ef0ac3729e 100755 (executable)
--- 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