[wdfx]

Ardour has snapshots [1] which is a somewhat manual approach to this. I assume you can copy/paste parts of a session between snapshots as a "merge".

[1] http://manual.ardour.org/working-with-sessions/snapshots/

[rhizome]

Hydrogen also has a "save version" action that does something similar.