From 77501fe72f21618fd6c290013b8151170f73247b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 23 Oct 2016 12:11:52 -0400
Subject: tools/notsd-move: avoid invoking the editor for the merge commit

---
 tools/notsd-move | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/notsd-move b/tools/notsd-move
index a2190bac64..fcb9eaff4b 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -852,7 +852,7 @@ main() {
 	git commit -m './tools/notsd-move'
 	git merge -s ours notsystemd/postmove
 	git checkout notsystemd/postmove
-	git merge tmp/postmove
+	git merge --no-edit tmp/postmove
 	git branch -d tmp/postmove
 }
 
-- 
cgit v1.2.3-54-g00ecf