From d9ceb9050df1004a6920d7ff36bbd96e5f52ef02 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <ryanakca@kubuntu.org>
Date: Thu, 18 Aug 2011 08:30:19 -0400
Subject: Added merge target

---
 .gitignore | 1 +
 dm         | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 798757d..a60e307 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .*.swp
 build
 SUBSTS.local
+SUBSTS.merged
 .mutt/alias.rc
diff --git a/dm b/dm
index f9b8251..78d09ec 100755
--- a/dm
+++ b/dm
@@ -108,6 +108,13 @@ sha256sums.asc: sha256sums
 	rm -f $@
 	gpg --armor --detach-sign $<
 
+merge: SUBSTS $(SUBSTS_FILE)
+	# sdiff has exit status 1 if files are different. Ignore
+	- sdiff -o SUBSTS.merged $^
+	@echo ""
+	@echo "Please review SUBSTS.merged, then run"
+	@echo "mv SUBSTS.merged $(SUBSTS_FILE)"
+
 verify:
 	# BSD sha256 sum command doesn't have a -c option.
 	# BSD and coreutils sha256 commands have different outputs, however, the
@@ -153,4 +160,4 @@ verify:
 clean:
 	rm -fr build
 
-.PHONY: build install clean verify
+.PHONY: build install clean verify merge
-- 
cgit v1.2.3