From 797ad99addcedbb52d2a5ada6aac55e68c350837 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Thu, 4 Sep 2008 00:08:28 +0000
Subject: jail-commit: using unified diff

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@515 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/src/jail-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'trunk/src/jail-commit')

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
-- 
cgit v1.2.3