diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-09-06 13:25:49 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-09-06 13:25:49 +0000 |
| commit | 7973ab9d62d1ffeddef4a9c5760cb8ecd4758a66 (patch) | |
| tree | 85333412a3c0f5d9b894c29ca9bf5791ff3cc6da /usr.sbin/sysmerge/sysmerge.sh | |
| parent | e275f0e5a98bc1478877408aa18dd9a0041804d7 (diff) | |
- don't list *.merged files in the "remaining for you to merge by hand"
list, it's very confusing.
ok sthen@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 73bbe28955e..b8e983af3cf 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.21 2008/09/02 11:38:06 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.22 2008/09/06 13:25:48 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -440,7 +440,7 @@ do_post() { fi if [ "${FILES_IN_TEMPROOT}" ]; then echo "===> File(s) remaining for you to merge by hand:" - find "${TEMPROOT}" -type f -size +0 -exec echo " {}" \; + find "${TEMPROOT}" -type f ! -name \*.merged -size +0 -exec echo " {}" \; fi if [ "${FILES_IN_BKPDIR}" ]; then echo "===> Backup of replaced file(s) can be found under" |