From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Jun 2016 11:58:32 +0000 (+0100)
Subject: Split brain: quiltify_trees_differ: Improve doc comment
X-Git-Tag: archive/debian/2.0~318
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=40f91b11738a9d84bd8b329c40003d5ac5f08ec3;hp=61b51ad1c4b8b949f83c420fa3c2b92215643037

Split brain: quiltify_trees_differ: Improve doc comment
---

diff --git a/dgit b/dgit
index 4ac5748b..3e4741f7 100755
--- a/dgit
+++ b/dgit
@@ -2513,8 +2513,9 @@ END
 sub quiltify_trees_differ ($$;$) {
     my ($x,$y,$finegrained) = @_;
     # returns true iff the two tree objects differ other than in debian/
-    # returns bitmas 01 - differ in upstream files except .gitignore
-    #                02 - differ in .gitignore
+    # with $finegrained,
+    # returns bitmask 01 - differ in upstream files except .gitignore
+    #                 02 - differ in .gitignore
     local $/=undef;
     my @cmd = (@git, qw(diff-tree --name-only -z));
     push @cmd, qw(-r) if $finegrained;