possible to classify these commits appropriately: pseudomerges are
fairly obvious (if all three trees are identical, we descend to the
parent with the most recent commit date), and the `p' special merge is
-the only non-psuedo merge and has a special form.
+the only non-pseudo merge and has a special form.
So it would be possible to write a `git-debrebase' tool which would
take (for example) B4, above, and be able to perform functions like:
II. New upstream (0 + 00 neq #)
- --/--B3!--%--/------E*-------------/-->
+ --/--B3!--%--/------D*-------------/-->
/ / /
% 4 4**
/ 3 3