+
+
+Strategies for each metadata file merge:
+
+ in base/tip same patch's tip dep -> base base -> tip
+
+ msg T textual merge rm from src not in src
+ deps T list merge rm from src not in src
+ deleted T std existence merge rm from src not in src
+ patch- BT must be same rm from src must be same
+ topgit- T must be same rm from src not in src
+ [^+]*- ?? textual merge rm from src rm from src
+ +included BT list merge rm from non-tb src list merge
+ +*- ?? textual merge rm from non-tb src textual merge
+ *[^-] ?? die, aborting all ops, if found in any tb src or branch