Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 git-mestrelion-tools (1.0.4-1) unstable; urgency=medium
 .
   * New upstream snapshot (git restore-mtime --first-parent).
Author: Adam Borowski <kilobyte@angband.pl>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- git-mestrelion-tools-1.0.4.orig/git-strip-merge
+++ git-mestrelion-tools-1.0.4/git-strip-merge
@@ -54,9 +54,9 @@ usage() {
 	     show this page.
 
 	  -v, --verbose
-	     do not use -q to supress normal output of internal steps from git
+	     do not use -q to suppress normal output of internal steps from git
 	     checkout, rm, commit. By default, only git merge output is shown.
-	     Errors, however, are never supressed
+	     Errors, however, are never suppressed
 
 	  -M <message>, --msgcommit=<message>
 	     message for the removal commit in <branch>. Not to be confused
--- git-mestrelion-tools-1.0.4.orig/man1/git-strip-merge.1
+++ git-mestrelion-tools-1.0.4/man1/git-strip-merge.1
@@ -30,9 +30,9 @@ For more information, see <http://stacko
 show help message and exit
 .TP 8
 .BR \-v , \ \-\-verbose
-do not use -q to supress normal output of internal steps from git
+do not use -q to suppress normal output of internal steps from git
 checkout, rm, commit. By default, only git merge output is shown.
-Errors, however, are never supressed.
+Errors, however, are never suppressed.
 .TP 8
 .BR \-M\  <message>, \ \-\-msgcommit =<message>
 message for the removal commit in <branch>. Not to be confused
