On 09/15/2010 06:34 PM, mflorea (SVN) wrote:
> Author: mflorea
> Date: 2010-09-15 17:34:58 +0200 (Wed, 15 Sep 2010)
> New Revision: 31119

[snip]

> Property changes on: platform/web/branches/xwiki-web-2.4/standard
> ___________________________________________________________________
> Added: svn:mergeinfo
>     + /platform/web/trunk/standard:31118
>
>
> Property changes on: 
> platform/web/branches/xwiki-web-2.4/standard/src/main/webapp/resources/icons/silk
> ___________________________________________________________________
> Deleted: svn:mergeinfo
>     -
>
>
> Property changes on: 
> platform/web/branches/xwiki-web-2.4/standard/src/main/webapp/resources/js/prototype/prototype.js
> ___________________________________________________________________
> Deleted: svn:mergeinfo
>     -
>
>
> Property changes on: 
> platform/web/branches/xwiki-web-2.4/standard/src/main/webapp/resources/js/scriptaculous
> ___________________________________________________________________
> Deleted: svn:mergeinfo
>     -
>
>
> Property changes on: 
> platform/web/branches/xwiki-web-2.4/standard/src/main/webapp/resources/js/xwiki/accordion/accordion.js
> ___________________________________________________________________
> Deleted: svn:mergeinfo
>     -
>
>
> Property changes on: 
> platform/web/branches/xwiki-web-2.4/standard/src/main/webapp/resources/js/xwiki/chartwizard/chwSampleBarChart.png
> ___________________________________________________________________
> Deleted: svn:mergeinfo
>     -

..do you know how can we get rid of this? It makes the diff almost 
unreadable.

Thanks,
Marius
_______________________________________________
devs mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/devs

Reply via email to