diff tests/test-merge-local.t @ 33512:1424a769f31b

bookmark: use 'divergent2delete' when updating a bookmark
author Boris Feld <boris.feld@octobus.net>
date Mon, 10 Jul 2017 19:12:25 +0200
parents 69ffbbe73dd0
children 9e4f82bc2b0b
line wrap: on
line diff