From 3fca69b2cdcc288e96f335bbd7ecdc8bc6912749 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 25 Jun 2007 23:24:26 +0200 Subject: [PATCH] Fix contrib/stg-whatchanged way of identifying a conflict. Signed-off-by: Yann Dirson --- contrib/stg-whatchanged | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged index d5b6965..a416e97 100755 --- a/contrib/stg-whatchanged +++ b/contrib/stg-whatchanged @@ -24,7 +24,7 @@ fi # Merges via "push" leave top=bottom so we must look at old patch # in this case (unlike, eg., "pick --fold") patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)" -if [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ]; +if [ -s "$(git-rev-parse --git-dir)/conflicts" ]; then current_cmd="stg show //top.old" else -- 2.11.0