echo Merge failed 1>&2
echo $h >>../merge.debug
git diff >>../merge.debug 2>&1
- um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
- [ "$um_files" ] && [ -f "../merge-files/akpm-current" ] && {
- rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
- [ "$rm_files" ] &&
- "$bin_dir/do_rm" $rm_files
- }
+
+ check_unmerged_files akpm-current
+
git diff 2>&1 | egrep -q '<<<<<|^\*' && {
bash -i || exit
}
bash -i || exit
}
echo "fix up?"
-notify-send "Waiting for akpm fix up"
-pushover "Waiting for akpm fix up"
+linux-next-notify "Waiting for akpm fix up"
bash -i
log '$' cd $cpwd
cd $cpwd