.hgtags

Fri, 12 Apr 2019 11:13:16 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 12 Apr 2019 11:13:16 +0200
changeset 566
9a88920b15d8
parent 486
35d17c52d45c
child 604
c7bedb422d63
permissions
-rw-r--r--

increase snyc_conflict counter only after conflict renaming, to make sure the counter is correct when pull is aborted

02d3e4b1245f88b07ac443dece2caab2ee572628 v1.0.0
bebe0b436c846a34517184b780b076e1746aeabb v1.0.1
a66e0a1f01fc6d20d1a90078294877ad9d529a61 v1.1.0
7954fdacdb5c8426b5a7fd0a554da89cab68e4ba v1.1.1
1607450065baeb4b054d77555fcbe047be9b43dd v1.2.0
d6dea8c17f683874b8e61e94d9d577491feef90d v1.2.1
4996f8953c3a3ef379da90d353b8d82d8a6d5b98 v1.2.2
c7bea9ad9d9cc8836505b777e2616fa4ab731671 v1.2.3

mercurial