diff options
| -rwxr-xr-x | trunk/src/jail-commit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trunk/src/jail-commit b/trunk/src/jail-commit index f40e5cd..41e80ea 100755 --- a/trunk/src/jail-commit +++ b/trunk/src/jail-commit @@ -55,7 +55,7 @@ function template_merge { if [[ -e "$file" && -e "$1/$file" ]]; then if [ ! -d "$file" ] && [ ! -h "$file" ]; then - if ! diff $file $1/$file; then + if ! diff -u $file $1/$file; then echo Updating $file cp -af $1/$file $file fi |