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)" ] && {