]> gitweb.fluxo.info Git - simplepkg.git/commitdiff
jail-commit: using unified diff
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Thu, 4 Sep 2008 00:08:28 +0000 (00:08 +0000)
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Thu, 4 Sep 2008 00:08:28 +0000 (00:08 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@515 04377dda-e619-0410-9926-eae83683ac58

trunk/src/jail-commit

index f40e5cdf851bcd29ec23487b862dd8c5430af827..41e80ea010e921953a46619cc06631df56294a05 100755 (executable)
@@ -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