[EGIT] [tools/eflete] master 01/05: diff: do not abort on undo merged diffs (text name undo)

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=06bd302572577ddc042da118d29c23701f89fa8d

commit 06bd302572577ddc042da118d29c23701f89fa8d
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Thu Jan 21 18:45:54 2016 +0000

    diff: do not abort on undo merged diffs (text name undo)
---
 src/bin/editor/diff.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/editor/diff.c b/src/bin/editor/diff.c
index 740fbc9..9c1512e 100644
--- a/src/bin/editor/diff.c
+++ b/src/bin/editor/diff.c
@@ -368,6 +368,7 @@ diff_update(Diff *diff, Diff *new_diff)
      }
 
    diff->redo = new_diff->redo;
+   diff->undo = new_diff->undo;
    diff_free(new_diff);
 }
 

--