summaryrefslogtreecommitdiff
path: root/undoaction.cpp
AgeCommit message (Expand)Author
2020-03-31Undobuffer merging and mergetoolJosh Ferrell