summaryrefslogtreecommitdiff
path: root/subversion/libsvn_client/conflicts.c
Commit message (Collapse)AuthorAgeFilesLines
* Vendor import svn-1.14.0.vendor/subversion/subversion-1.14.0vendor/subversionDimitry Andric2020-05-311-716/+3013
| | | | | Notes: svn path=/vendor/subversion/dist/; revision=361669 svn path=/vendor/subversion/subversion-1.14.0/; revision=361670; tag=vendor/subversion/subversion-1.14.0
* Pull upstream r1839662Peter Wemm2018-10-081-14/+22
| | | | | | | | | | | | | "Don't scan for moves for 'local missing' conflicts unless a YCA is known. Prevent the resolver from embarking on an endless search in case of a 'incoming edit vs. local missing' conflict where no YCA can be found which would cap our search through history." Requested by: des Notes: svn path=/vendor/subversion/dist/; revision=339234
* Vendor import svn-1.10.2vendor/subversion/subversion-1.10.2Peter Wemm2018-10-081-28/+43
| | | | | Notes: svn path=/vendor/subversion/dist/; revision=339232 svn path=/vendor/subversion/subversion-1.10.2/; revision=339233; tag=vendor/subversion/subversion-1.10.2
* Import Subversion-1.10.0vendor/subversion/subversion-1.10.0Peter Wemm2018-05-081-0/+11207
Notes: svn path=/vendor/subversion/dist/; revision=333347 svn path=/vendor/subversion/subversion-1.10.0/; revision=333348; tag=vendor/subversion/subversion-1.10.0