log tests/test-bookmarks-merge.t @ 16780:d064da05590d

age author description
Sun, 13 May 2012 11:55:42 +0200 David Soria Parra merge: respect bookmarks during merge
Sat, 12 May 2012 21:28:10 +0200 David Soria Parra bookmarks: delete divergent bookmarks on merge