commit 1652aeabff3f0579fd3929b2cffbe574b887b70a Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 31 18:34:42 2012 -0400

Document the --branch argument to contrib/findMergedChanges.pl --- contrib/findMergedChanges.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/findMergedChanges.pl b/contrib/findMergedChanges.pl index 46e070f..e4ff616 100755 --- a/contrib/findMergedChanges.pl +++ b/contrib/findMergedChanges.pl @@ -19,7 +19,7 @@ my $look_for_type = "merged"; if (! @ARGV) { print <<EOF Usage: - findMergedChanges.pl [--merged/--unmerged/--weird/--list] changes/* + 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 no subsequent changes in master.