Merge fixes up to GIT 1.1.3

diff --git a/git-fmt-merge-msg.perl b/git-fmt-merge-msg.perl
index f0f3100eb1c089efd990b71bb747f4dd0cd035f9..778388e254e8ecc07494c168aec503e3bc511fb3 100755 (executable)
--- a/git-fmt-merge-msg.perl
+++ b/git-fmt-merge-msg.perl
@@ -31,6 +31,8 @@ sub andjoin {
        my ($bname, $tname, $gname, $src);
        chomp;
        s/^[0-9a-f]*    //;
+       next if (/^not-for-merge/);
+       s/^     //;
        if (s/ of (.*)$//) {
                $src = $1;
        } else {
@@ -86,7 +88,7 @@ sub andjoin {
                            $src{$src}{GENERIC});
        my $this = join(', ', @this);
        if ($src ne '.') {
-               $this .= " from $src";
+               $this .= " of $src";
        }
        push @msg, $this;
 }