From b922e7983b3d275b935bea45757f806223389107 Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Mon, 14 Oct 2013 20:10:49 +0200
Subject: bash: patch-suggested-changes: the outer diff was reversed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 .bashrc-work | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.bashrc-work b/.bashrc-work
index 3fc6b75..ef9a7d8 100644
--- a/.bashrc-work
+++ b/.bashrc-work
@@ -4,11 +4,11 @@ patch-suggested-change() {
 	[ $# -ne 1 ] && int-usage "rej-file" && return
 	local origfile=${1%.rej}
 	{ echo "diff ${origfile}.patch ${origfile}.patch.orig"; colordiff -du \
+	  <(tail -n+3 "${origfile}.rej") \
 	  <(diff -du \
 		"${origfile}" \
 		<(wiggle --merge  "${origfile}" "${origfile}.rej") \
-	  | tail -n+3) \
-	  <(tail -n+3 "${origfile}.rej")
+	  | tail -n+3)
 	} | sed '2,4d;' | subdiff
 	#} | subdiff | tail -n+5
 }
-- 
cgit