Using ace-diff tool, we can't do redo and undo while merging from one side to other side . But CodeMirror doing redo and undo option, CodeMirror Mergetool Url : http://codemirror.net/demo/merge.html#