export LOG_FILE=../akpm-import.log
+# shellcheck source=./common.sh
+. "$(dirname "$0")/common.sh" ''
+
log()
{
echo "$@" | tee -a $LOG_FILE
execute git branch tmp-akpm/current ||
$SHELL -i || exit
execute git merge --no-edit --no-stat "$dnb" || {
- umf=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
- [ "$umf" ] && [ -f "../merge-files/akpm-current" ] && {
- rmf=$(grep -F "$umf" "../merge-files/akpm-current")
- [ "$rmf" ] &&
- "$bin_dir/do_rm" $rmf
- }
+ check_unmerged_files akpm-current
+
git diff 2>&1 | grep -E -q '<<<<<|^\*' && {
$SHELL -i || exit
}