automate deleting of files

diff --git a/do_merge b/do_merge
index 964c3b3e1f0fb5863f71f5825cefa61557c78a93..b86f527739020e7e5e48a07ce4e9f5203fc3bfd2 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -124,6 +124,12 @@ for h in $heads; do
                        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/$tree" ] && {
+                               rm_files=$(grep -F "$um_files" "../merge-files/$tree")
+                               [ "$rm_files" ] &&
+                                       "$bin_dir/do_rm" $rm_files
+                       }
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                bash -i || exit
                        }