I am bad at formatting.

diff --git a/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn b/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn
index 421315b93c0d1ae4b78b7408dfdc1d7c69e96a5b..ac75c441a75ef8670b10798e7260ee48d6d606b5 100644 (file)
--- a/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn
+++ b/doc/bugs/Webedits_without_comment_don__39__t_make_it_through_git.mdwn
@@ -4,21 +4,21 @@ A subsequent commit (including another web page edit with comments) will pull th
 
 IkiWiki/plugin/git.pm checks for a version of git greater than 1.5.4, and if greater, commits with a blank message and '--cleanup=verbatim'.  The cleanup option doesn't let the message get committed.  Relatively new versions of git support '--allow-empty-message' but I haven't been able to identify when that feature was added.  Instead I opted for a default message.
 
 
 IkiWiki/plugin/git.pm checks for a version of git greater than 1.5.4, and if greater, commits with a blank message and '--cleanup=verbatim'.  The cleanup option doesn't let the message get committed.  Relatively new versions of git support '--allow-empty-message' but I haven't been able to identify when that feature was added.  Instead I opted for a default message.
 

-544,545d543
-<      # git will not commit with a blank comment, though this 
-<      # can be overridden in later versions.  
-547c545,553
-<              $params{message}.="No commit message specified.";
----
->              # Force git to allow empty commit messages.
->              # (If this version of git supports it.)
->              my ($version)=`git --version` =~ /git version (.*)/;
->              if ($version ge "1.5.4") {
->                      push @opts, '--cleanup=verbatim';
->              }
->              else {
->                      $params{message}.=".";
->              }
+    544,545d543
+    <  # git will not commit with a blank comment, though this 
+    <  # can be overridden in later versions.  
+    547c545,553
+    <          $params{message}.="No commit message specified.";
+    ---
+    >          # Force git to allow empty commit messages.
+    >          # (If this version of git supports it.)
+    >          my ($version)=`git --version` =~ /git version (.*)/;
+    >          if ($version ge "1.5.4") {
+    >                  push @opts, '--cleanup=verbatim';
+    >          }
+    >          else {
+    >                  $params{message}.=".";
+    >          }

 
 The other option would be to change only line 549:
 
 
 The other option would be to change only line 549: