Branko Čibej wrote on Fri, 30 Jun 2017 06:18 +0200:
> On 30.06.2017 06:04, Daniel Shahaf wrote:
> > I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have
> > two separate working copies: the current directory (./) is a working
> > copy of branches/1.9.x and ../wc-of-trunk is a work
On 30.06.2017 06:04, Daniel Shahaf wrote:
> I'm trying to merge trunk/CHANGES into branches/1.9.x/CHANGES. I have
> two separate working copies: the current directory (./) is a working
> copy of branches/1.9.x and ../wc-of-trunk is a working copy of /trunk.
> When I try the sync merge syntax with
