Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-13 Thread Jaikiran Pai
uli 17:53 2017 Onderwerp: Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master' I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge" against latest master of upstream, which created this merge commit. -Jaikiran On 1

Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-12 Thread Maarten Coene
: Jaikiran Pai <jai.forums2...@gmail.com> Aan: dev@ant.apache.org Verzonden: woensdag 12 juli 17:53 2017 Onderwerp: Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master' I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge"

Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-12 Thread Jaikiran Pai
I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge" against latest master of upstream, which created this merge commit. -Jaikiran On 12/07/17 1:45 PM, Maarten Coene wrote: Any idea where this commit comes from?I didn't touch any of these files as far as