From f026dd64cdde1912096e2d19c174bb8ce09c0123 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 25 Aug 2016 11:25:06 +0000 Subject: [PATCH] Hold some commits which have been merged forward to a newer dev branch. - Legacy-Id: 11872 --- hold-for-merge | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hold-for-merge b/hold-for-merge index 3a064825f..c4357f23b 100644 --- a/hold-for-merge +++ b/hold-for-merge @@ -1,5 +1,7 @@ # -*- conf-mode -*- +/branch/proceedings/6.29.1.dev0@11850 # Merged into /branch/proceedings/6.30.1.dev0, will be merged from there +/branch/proceedings/6.29.1.dev0@11856 # Merged into /branch/proceedings/6.30.1.dev0, will be merged from there /personal/rcross/6.29.1.dev0@11765 # Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there /personal/rcross/6.29.1.dev0@11768 # Merged into ^/personal/rjs/6.29.1.dev0@11770, will be merged from there