divergence-resolution: update some comments

8 jobs for topic/default/gca-refactoring1 in 7 minutes and 31 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #168942
checks-py2

00:02:26

passed #168943
checks-py3

00:01:50

passed #168948
doc

00:00:31

manual #168941
allowed to fail manual
pytype
passed #168944
tests-py2-cext

00:07:31

passed #168945
tests-py2-pure

00:03:49

passed #168946
tests-py3-cext

00:07:29

passed #168947
tests-py3-pure

00:04:46