do_merge: Print if fixes exist when merge fails

diff --git a/do_merge b/do_merge
index 0ad0d440da5c5d4a3219cd979ab9b30b006361fe..0dfa7d52c7947611f7f29af446dc7e9408ac3cdb 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -134,6 +134,10 @@ for h in $heads; do
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                notify-send -t 0 -u critical "linux-next new conflict found merging $tree!"
                                pushover "linux-next new conflict found merging $tree!"
+                               if [ -f "../merge-fixes/$tree" ]; then
+                                       echo "Merge fixes exist for this tree:"
+                                       cat "../merge-fixes/$tree"
+                               fi
                                bash -i || exit
                        }
 #                      [ "$(git status --porcelain)" ] && {