Fix contrib/stg-whatchanged way of identifying a conflict.

Signed-off-by: Yann Dirson <ydirson@altern.org>

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index d5b6965ccef8f2e620642fe754fd7771561cd282..a416e97b6d1ccf27e7bec9c5aad473c220c7dbd4 100755 (executable)
--- 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)"
 # 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
 then
     current_cmd="stg show //top.old"
 else