almost-git

Version:

almost-git is a tool for model and text co-evolution

10 lines (9 loc) • 75 B

Plain Text

===== <<<<<<< HEAD res ===== bar ======= bar1 >>>>>>> squash commits =====