merge.conflictstyle diff3

Space: magic-space

Switch to built-in Readline file/directory completion capability as they more visually rich and convenient.

pip

Reindent code.

virtualenv

Remove unused vars.

With -v javap print class version.

Get out outdated syntax for plug-in enabling.

colored-stats

No longer needs in 'e.' alias. 'e' command open files without args.

merged

Emacs command useful don't omit it.

git analog of 'hg glog'.

Use mplayer instead of vlc for video.

Use softvol-max to increase upper volume in two times.

Fix pitch when speed up playback.

Use oages for in/out command.

Push only current brunch.

Fix color definition.

Open SNES with mednafen.

Prevent screen pollution with error output.

Play SEGA with mednafen.

Detect empty LD_LIBRARY_PATH.

Disable fetch in flavor of "pull -u".

Disable transplant in flavor of graft.

Completion for mypath Bash helper.

myfind and mypath interactive bash session helper function.

Highlight path. Use it as output separator.

Enable pager extension.

merged

http://stackoverflow.com/questions/24454076/how-to-force-gradle-to-use-share-m2-repository-with-maven-system-wide/

Prevent creation of .orig files after revert.

Simplify path to my projects.

Fix XLS and DOC file handling by MC.

To removing untracked files.

To removing untracked files.

Enable rebase extantion.

merged

Fix errors when some utilities not present.

Open .shtml files.

Do not allow pull/push MQ temporary changesets.

I don't use external merge tools.

Color diff.

Get beck ClickToFocus as without it I cant move/resize/close Firefox Web Developer transient "Inspect Network Request" windows. Also I like that click on main window area doesn't hide previous active window by rising clicked window.

Don't bind in noninteractive mode to prevent from printing warnings: bind: warning: line editing not enabled when used in "hg push ssh://..."

Add datediff useful function.

Ignore whitespaces when doing source annotation.

Fix Fvwm maximize window problem with stalonetray. Stalonetray try to avoid covering of tray window by maximized windows.

Colormap is the one for the window that currently has the keyboard focus.

Move program styles below common definitions to override common defaults.

Ignore PPosition hint. Many programs set PPosition to something obnoxious like 0,0 (upper left corner).

MwmButtons

Remove ambiguous menu hot key.

Remove quotes from asterisk style name.

Use FPClick* instead of MouseFocusClickRaises

Add tray to desktop.

Add stabs to easy disable debugging.

Use short title for FvwmPager.

Group window styles configuration to common place. Avoid MwmDecor as it damage resizing and closing transient windows.

Decorate transient window.

Show class and resource name in window title.

SnapAttraction SameType

Multi-monitor setup.

Add docs.

Set default font. Make title more narrow.

merged

Reorder text to show that BugOpts wasn't related to FvwmDebug module.

Enable FvwmCommandS module for FvwmCommand utility in order to user REPL in Emacs fvwm-mode.

Remove unused directory from possible image dir.

Fix spelling.

merged

Disable -gray pattern in order to prevent blinking because of LCD-insertion effect.

merged

Use new syntax for setting SVG icon size to prevent huge icons in menu.

Remove '-3' option from calendar as it conflict with year argument.

Set NPM prefix to local user directory.

Mark file as sh script for Emacs.

Use .env file as common env var settings for Bash and Zsh.

Set useful "hg diff" defaults.

Add new and update old entries.

Strip year part. Make window smaller.

Remove fontconfig. Use "dpkg-reconfigure fontconfig-config" instead.

Put empty line before bash prompt.

Rename Firefox devel profile.

Bash completion for Firefox.

Update options according to "gradle --help" with v1.4.

Add cli option handling for gradle bash-completion.

Add gradle completion.

merged

Fix: NameError: name 'codecs' is not defined.

Fix typo.

Enable daemon mode for gradle.

Use compound assignment to array instead of manual index updating.

Add trailing slash to directory in "cd" completion.

Use evince instead of xpdf to be able search Russian text.

Add prompt2 style.

Add check for tclreadline package and terminal color support.

Print current dir at prompt. Remove broken code.

Add readline and completion support to tclsh.

Add test Firefox.

Set date format and output style.

Set isql like prompt and go on semicolon.

Close window by LeftWin+F4 (delete window protocol).

Ignore num-lock as modifier.

Remove follow (-v) option as it forbid VC-mode from listening history on directories.

Add Squirrel to menu.

Make screen larger.

Basic glhacks options.

Bind "M-Right" to 'menu-complete'. Useful in Python with readline completion from Emacs...

merged

Use ISO 8601 date format for "git log".

Enable '**' patttern matching. If the pattern is followed by a /, only dirs match. Ignore case in glob. Show stopped jobs before exit.

I realise that sudo mv/cp/... commands are valuable to store in history...

merged

Colorizer for java logs...

merged

Register lisp files.

merged

html and css are svn:eol-style=native.