log tests/test-bookmarks-merge.t @ 17970:0b03454abae7

age author description
Mon, 27 Aug 2012 09:57:58 -0400 John Li tests: merging bookmarked heads stable
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