Georg Brandl schrieb:
> I just wanted to merge a series of commits to py3k where the first
> added a new file, and the others changed it. Output was:
>
> property 'svnmerge-integrated' deleted from '.'.
>
>
>
> property 'svnmerge-blocked' deleted from '.'.
>
> --- Merging r71409 into '.':
> A
I just wanted to merge a series of commits to py3k where the first
added a new file, and the others changed it. Output was:
property 'svnmerge-integrated' deleted from '.'.
property 'svnmerge-blocked' deleted from '.'.
--- Merging r71409 into '.':
ADoc/tools/sphinxext/static/basic.css
sv
