From 44c52debfb8bc27a78e4159fff30ac6e716c9518 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Mon, 6 Jan 2014 13:06:26 +0000 Subject: Add options to diff command to change header content to only include file name, and explicitly ask for a unified diff --- baserock-system-config-sync/baserock-system-config-sync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync index b17c8d0..cb5984d 100755 --- a/baserock-system-config-sync/baserock-system-config-sync +++ b/baserock-system-config-sync/baserock-system-config-sync @@ -151,12 +151,12 @@ merge_regular_file() { cp -a "$vu" "$vt" ;; 'none exists exists') - if ! (diff "$v2" "$vu" | patch "$v2" -t -o "$vt"); then + if ! (diff -u "$v2" --label="$v2" "$vu" --label="$vu" | patch "$v2" -t -o "$vt"); then cp -a "$v2" "$vt" # merge failed, use v2 fi ;; 'exists exists exists') - if ! (diff "$v1" "$vu" | patch "$v2" -t -o "$vt"); then + if ! (diff -u "$v1" --label="$v1" "$vu" --label="$vu" | patch "$v2" -t -o "$vt"); then cp -a "$v2" "$vt" # merge failed, use v2 fi ;; -- cgit v1.2.1