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

[stgit] / contrib / stg-whatchanged

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index f80d0a1..a416e97 100755 (executable)
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged
@@ -23,8 +23,8 @@ 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)/$(stg top)"
-if [ $(cat "$patchdir/bottom") = $(cat "$patchdir/top") ];
+patchdir="$(git-rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
+if [ -s "$(git-rev-parse --git-dir)/conflicts" ];
 then
     current_cmd="stg show //top.old"
 else