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

..

event

Makefile.ams cleanup.

2012-07-17 17:04:05 +04:00

filehighlight

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

mcconfig

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

search

Makefile.ams cleanup.

2012-07-17 17:04:05 +04:00

skin

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

strutil

Makefile.ams cleanup.

2012-07-17 17:04:05 +04:00

tty

Makefile.ams cleanup.

2012-07-17 17:04:05 +04:00

vfs

Ticket #2791: Fixed: cannot Copy/Move files with filename encoding change

2012-08-29 13:30:28 +03:00

widget

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

charsets.c

Code cleanup: removed unused variables amd removed unnedeed code.

2012-07-17 17:04:05 +04:00

charsets.h

Core, mceditor, mcviewer and mcdiffviewer code tweak and cleanup

2012-06-25 16:58:57 +04:00

event-types.h

Optimization of history load.

2011-06-21 16:13:10 +04:00

event.h

Event system: added addition parameter event_init_data to mc_event_del() function.

2011-06-21 16:13:10 +04:00

filehighlight.h

Lib: removed includes to "src" directory

2011-03-21 23:55:52 +02:00

fileloc.h

Ticket #2625: mc does not preserve file mtime when copying over ssh

2011-12-12 11:51:25 +03:00

fs.h

Code cleanup after runing splint on src/main.c file

2011-10-17 13:30:03 +03:00

glibcompat.c

Ticket 1551: Update GPL version from 2 to 3

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

glibcompat.h

Code indentation in lib directory

2010-11-24 10:27:20 +03:00

global.c

Reorder fields in mc_global struct and change type for some of them.

2012-03-19 11:06:00 +03:00

global.h

Code indentation.

2012-07-17 17:04:05 +04:00

hook.c

Code indentation.

2012-07-17 17:04:05 +04:00

hook.h

Moved hooks from lib/util.[ch] to new files lib/hook.[ch]

2010-11-24 10:27:46 +03:00

keybind.c

Ticket #2863 (mcdiff bidirectional merge enhancement)

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

keybind.h

Ticket #2863 (mcdiff bidirectional merge enhancement)

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

lock.c

g_dirname and g_basename function are deprecated since glib-2.2.

2012-04-22 11:25:10 +03:00

lock.h

Changed lock_file() and unlock_file() functions

2012-03-06 11:52:30 +03:00

logging.c

Added function mc_config_get_full_path() for search user's config files by short names.

2011-12-06 16:24:10 +03:00

logging.h

Added new function mc_always_log() for logging on early bootstrap stages

2011-01-20 17:38:27 +02:00

Makefile.am

Makefile.ams cleanup.

2012-07-17 17:04:05 +04:00

mcconfig.h

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

search.h

Don't mix mc_search_cb_ret_t and int as result of search callback.

2012-05-08 18:57:55 +04:00

serialize.c

Optimization of ini files load.

2012-07-31 14:50:11 +04:00

serialize.h

Added ability to serialize/deserialize strings and config objects(mc_config_t)

2011-06-23 14:45:00 +03:00

skin.h

Skin support for window frames.

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

strescape.h

Code indentation in lib directory

2010-11-24 10:27:20 +03:00

strutil.h

Check assert.h header and use it conditionally.

2012-03-19 11:04:57 +03:00

timefmt.c

Ticket 1551: Update GPL version from 2 to 3

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

timefmt.h

Moved time related stuff from lib/util.[ch] into lib/timefmt.[ch].

2010-11-24 10:27:47 +03:00

unixcompat.h

Code indentation in lib directory

2010-11-24 10:27:20 +03:00

util.c

Revert "Try fix of compile warnings about assigned but unused variables"

2012-07-18 12:03:31 +04:00

util.h

Changes to handle vfs_path_t object:

2012-03-06 11:52:31 +03:00

utilunix.c

Core, mceditor, mcviewer and mcdiffviewer code tweak and cleanup

2012-06-25 16:58:57 +04:00

utilunix.h

Lib: removed includes to "src" directory

2011-03-21 23:55:52 +02:00

widget.h

Moved filemanager-related stuff to src/filemanager directory

2010-11-24 10:51:32 +03:00