diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-09-04 00:08:28 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-09-04 00:08:28 +0000 |
| commit | 797ad99addcedbb52d2a5ada6aac55e68c350837 (patch) | |
| tree | fa7432a204a140cae8e67c5dc0359a1264cf8b31 /trunk/src/jail-commit | |
| parent | 02c35be015c168aa9ad36cb328b29f23b38dd437 (diff) | |
| download | simplepkg-797ad99addcedbb52d2a5ada6aac55e68c350837.tar.gz simplepkg-797ad99addcedbb52d2a5ada6aac55e68c350837.tar.bz2 | |
jail-commit: using unified diff
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@515 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/jail-commit')
| -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 |