Added a comment: resolving merge conflicts
authorIlya_Shlyakhter <Ilya_Shlyakhter@web>
Thu, 24 Jun 2021 18:03:40 +0000 (18:03 +0000)
committeradmin <admin@branchable.com>
Thu, 24 Jun 2021 18:03:40 +0000 (18:03 +0000)
commit7ad95210d19bf21d76da7a76142876fc9a537045
treee1b6e0727ee2a1a0f07a0a4d46eec66596146cbf
parentfb2e418fa2c01f69e8a014d46b48c41b61485105
Added a comment: resolving merge conflicts
doc/todo/resolve_merge_conflicts_with_smallfiles/comment_3_9098b3f365af6fe0692cf02b31fd6dee._comment [new file with mode: 0644]