merge_akpm: add removing files logic

diff --git a/merge_akpm b/merge_akpm
index f7670dbcf1a6594488905294705a14771ec6bd7d..6f3f0705efd4b496f1abe26b0fef2ede82aa6c5e 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,6 +36,12 @@ execute git merge --no-ff akpm-current/current || {
        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
+       }
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }