Hello!
Mail script show combined diff for merge commits:
http://git.php.net/?p=php-src.git;a=commitdiff;h=7f05a39fce42029c126d6dc315ffdad43d27c8e9;hp=-c
It's diff between 3 revisions. (2 parents and 1 merge commit).
With regards, Alexander Moskaliov
ir...@irker.net
2012/3/25 Pierrick Charron :
I looked at the git log/diff and I think there is a problem with the
mailing system. It did not send the diff from the good parent for the merge.
Pierrick
On 24 March 2012 18:07, Pierrick Charron wrote:
> Hmmm I think I have the same issue as Hannes. All those changes are not
> the one I did on
Hmmm I think I have the same issue as Hannes. All those changes are not the
one I did on the 5.3 branch.
Any clue on how to deal with that ?
Thanks
Pierrick
On 24 March 2012 17:59, Pierrick Charron wrote:
> Commit:7f05a39fce42029c126d6dc315ffdad43d27c8e9
> Author:Pierrick Charron
Commit:7f05a39fce42029c126d6dc315ffdad43d27c8e9
Author:Pierrick Charron Sat, 24 Mar 2012
17:59:46 -0400
Parents: 10809686f0dbcbbf0eb06c968d65e0febe1dc034
da2da13f935b2775635cd21b47a78fbf025a462d
Branches: PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitd
