X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=4b9be3adcb2aa61b3045e61e81933036daf3a29f;hb=HEAD;hp=0c3684d74887a3e0ceb347faa0963755c3a9f424;hpb=c732fa9f6ca336e2e3e601f9b3b7c9a127a23575;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index 0c3684d..4b9be3a 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,12 +36,9 @@ 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
-	}
+
+	check_unmerged_files akpm-current
+
 	git diff 2>&1 | egrep -q '<<<<<|^\*' && {
 		bash -i || exit
 	}