X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/3fca69b2cdcc288e96f335bbd7ecdc8bc6912749..1629f59ff44b517fd0e738aca41d5657d083d842:/contrib/stg-whatchanged

diff --git a/contrib/stg-whatchanged b/contrib/stg-whatchanged
index a416e97..f1f5308 100755
--- a/contrib/stg-whatchanged
+++ b/contrib/stg-whatchanged
@@ -23,15 +23,11 @@ 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 [ -s "$(git-rev-parse --git-dir)/conflicts" ];
-then
-    current_cmd="stg show //top.old"
-else
-    current_cmd="stg show"
-fi
+patchdir="$(git rev-parse --git-dir)/patches/$(stg branch)/patches/$(stg top)"
+case $(stg log | head -n1) in
+    *push\(c\)*) former="//top.old" ;;
+    *) former="//top" ;;
+esac
 
-colordiff "$@" \
-    -I '^index [0-9a-b]*..[0-9a-b]*' \
-    -I '^@@ .* @@' \
-    <($current_cmd) <(stg diff -r//bottom) | less -RFX
+stg-mdiff -o "$*" \
+    $former //bottom..