log tests/test-bookmarks-merge.t @ 49960:c166b212bdee

age author description
Fri, 18 Nov 2022 13:47:29 +0000 Arseniy Alekseyev tests: run many tests in $TESTTMP/repo instead of $TESTTMP stable
Tue, 08 Oct 2019 19:35:30 -0700 Kyle Lippincott destutil: provide hint on rebase+merge for how to specify destination/rev
Thu, 07 Mar 2013 14:17:56 +1100 Stephen Lee update: show message when a bookmark is activated by update
Wed, 14 May 2014 12:49:55 -0700 Siddharth Agarwal update: when deactivating a bookmark, print a message
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