log tests/test-bookmarks-merge.t @ 18739:5b7175377bab stable 2.5.2

age author description
Mon, 24 Dec 2012 13:26:13 +0100 Mads Kiilerich bookmarks: fix head selection for merge with two bookmarked heads stable
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