> -Original Message-
> From: Timur Khanipov [mailto:khani...@gmail.com]
> Sent: Wednesday, August 19, 2015 1:20 PM
> To: users@subversion.apache.org
> Cc: Иван Коптелов
> Subject: Two-step merge ok, one-step merge conflicts
>
> Hi folks.
>
> I faced the
Hi folks.
I faced the following problem. The command
svn merge -r 3:4 -r 4:5 ^^/trunk
works smoothly while command
svn merge -r 3:5 ^^/trunk
results in a text conflict. This seems like a buggy behavior (since
the two merges are equivalent).
I reproduced it in a simple situation when trunk con
