From 5e40696cc55fdc7ec273c052a13ef30dfb3f8c94 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 4 Jun 2015 23:23:15 +1000
Subject: [PATCH] automate deleting of files

---
 do_merge | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/do_merge b/do_merge
index 964c3b3..b86f527 100755
--- 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
 			}
-- 
2.39.2