diff options
| author | dougb <dougb@FreeBSD.org> | 2009-01-02 00:02:14 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-01-02 00:02:14 +0000 |
| commit | 23026218b1e51c86798706acd1270c61b4ed1668 (patch) | |
| tree | e23a395bde62e32a60a2ce338c0b8858e6dfb306 /usr.sbin/mergemaster | |
| parent | 400538cfec48f6f2e10f631a200377e93b3f72f6 (diff) | |
| download | FreeBSD-src-23026218b1e51c86798706acd1270c61b4ed1668.zip FreeBSD-src-23026218b1e51c86798706acd1270c61b4ed1668.tar.gz | |
For IGNORE_FILES delete the version in the TEMPROOT, not the base.
Submitted by: clemens fischer <ino-news@spotteswoode.dnsalias.org>
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 0265d75..00f4bde 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -644,7 +644,7 @@ case "${RERUN}" in # Avoid comparing the following user specified files for file in ${IGNORE_FILES}; do - test -e ${file} && unlink ${file} + test -e ${TEMPROOT}/${file} && unlink ${TEMPROOT}/${file} done ;; # End of the "RERUN" test esac |
