| commit | d8aa98b7d4c9f6649452e9640686f020831b7fcf | |
| author | Gergely Szasz <szaszg@hu.inter.net> | |
| Fri, 24 Aug 2012 14:30:12 +0000 (24 18:30 +0400) | ||
| committer | Ilia Maslakov <il.smind@gmail.com> | |
| Thu, 30 Aug 2012 06:43:20 +0000 (30 10:43 +0400) | ||
| tree | bce612f8d6f049f235c3f350845cdaf4be2f1a98 | treesnapshot (tar.gz zip) |
| parent | 961019d07820bc8c11e7f6d5781a5c04c597c8f4 | commitdiff |
Ticket #2863 (mcdiff bidirectional merge enhancement)
Added feature for the mcdiff for the bidirectional merge.
With F15 mcdiffviewer merge left panel to right panel direction.
original patch by Gergely Szasz <szaszg@hu.inter.net>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
added bind "MergeOther" into mc.keymap.default, mc.keymap.emacs.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Added feature for the mcdiff for the bidirectional merge.
With F15 mcdiffviewer merge left panel to right panel direction.
original patch by Gergely Szasz <szaszg@hu.inter.net>
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
added bind "MergeOther" into mc.keymap.default, mc.keymap.emacs.
Signed-off-by: Ilia Maslakov <il.smind@gmail.com>