Gergely Szasz d8aa98b7d4 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>

2012-08-30 10:43:20 +04:00

..

ext.d

Added support of viewing the compiled Java files (*.class).

2012-08-27 11:11:05 +03:00

macros.d

Ticket 1551: Update GPL version from 2 to 3

2011-10-18 14:08:34 +03:00

skins

Add icons to close window and toggle window state using mouse.

2012-06-20 22:26:10 +04:00

syntax

Ticket #2649: dlink.syntax: syntax highlighting for D-Link switches command set.

2012-07-27 10:17:11 +04:00

.gitignore

Add misc/mc.ext (which is generated from misc/mc.ext.in) to .gitignore

2009-11-08 21:48:24 +01:00

edit.indent.rc

Move some files from contrib into misc directory

2009-05-08 16:56:02 +03:00

filehighlight.ini

Ticket #2746: Add WebM support

2012-05-28 14:34:30 +03:00

Makefile.am

Remove misc/edit.spell.rc since aspell is supported by mcedit directly.

2012-07-12 16:00:49 +04:00

mc.charsets

Ticket #2037: minor changes in source tree.

2010-02-24 16:36:05 +00:00

mc.ext.in

Fixed OGV file extention handle.

2012-08-29 13:02:48 +03:00

mc.keymap

Show actual shortcuts in editor menu.

2009-10-26 16:15:32 +03:00

mc.keymap.default

Ticket #2863 (mcdiff bidirectional merge enhancement)

2012-08-30 10:43:20 +04:00

mc.keymap.emacs

Ticket #2863 (mcdiff bidirectional merge enhancement)

2012-08-30 10:43:20 +04:00

mc.lib

modified mc.lib, added alt-shift-arrows

2012-02-09 13:44:32 +04:00

mc.macros

added examples

2011-03-03 20:48:31 +00:00

mc.menu

Ticket #2748: wrong message in menu item "Delete tagged files if a copy exists in the other directory".

2012-03-19 11:07:43 +03:00

mc.menu.sr

Ticket #2748: wrong message in menu item "Delete tagged files if a copy exists in the other directory".

2012-03-19 11:07:43 +03:00

mcedit.menu

Ticket 1551: Update GPL version from 2 to 3

2011-10-18 14:08:34 +03:00

xterm.ad

Move some files from contrib into misc directory

2009-05-08 16:56:02 +03:00