diff options
| author | Ryan Kavanagh <ryanakca@kubuntu.org> | 2011-08-18 08:30:19 -0400 |
|---|---|---|
| committer | Ryan Kavanagh <ryanakca@kubuntu.org> | 2011-08-25 07:43:06 -0400 |
| commit | d9ceb9050df1004a6920d7ff36bbd96e5f52ef02 (patch) | |
| tree | ea62a7c5e66de299a817280316554326b88d21af | |
| parent | Different locales on different systems, handle (diff) | |
Added merge target
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | dm | 9 |
2 files changed, 9 insertions, 1 deletions
@@ -2,4 +2,5 @@ .*.swp build SUBSTS.local +SUBSTS.merged .mutt/alias.rc @@ -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 |