From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Apr 2013 15:14:06 +0000 (-0400)
Subject: Change dflt branch to inspect in findMergedChanges.pl
X-Git-Tag: tor-0.2.5.1-alpha~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e89d29bd5ee93b87ab0ce97e46408d196d0f6d4;p=thirdparty%2Ftor.git

Change dflt branch to inspect in findMergedChanges.pl
---

diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl
index e4ff6163e7..a35b0cf503 100755
--- a/contrib/findMergedChanges.pl
+++ b/contrib/findMergedChanges.pl
@@ -21,13 +21,13 @@ if (! @ARGV) {
 Usage:
    findMergedChanges.pl [--merged/--unmerged/--weird/--list] [--branch=<branchname] changes/*
 
-A change is "merged" if it has ever been merged to release-0.2.2 and it has had
+A change is "merged" if it has ever been merged to release-0.2.4 and it has had
 no subsequent changes in master.
 
-A change is "unmerged" if it has never been merged to release-0.2.2 and it
+A change is "unmerged" if it has never been merged to release-0.2.4 and it
 has had changes in master.
 
-A change is "weird" if it has been merged to release-0.2.2 and it *has* had
+A change is "weird" if it has been merged to release-0.2.4 and it *has* had
 subsequent changes in master.
 
 Suggested application:
@@ -36,7 +36,7 @@ Suggested application:
 EOF
 }
 
-my $target_branch = "origin/release-0.2.2";
+my $target_branch = "origin/release-0.2.4";
 
 while (@ARGV and $ARGV[0] =~ /^--/) {
     my $flag = shift @ARGV;