Mercurial > dotfiles

annotate unixSoft/hgrc-opendiff @ 266:93a8f55a4e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xmonad: add takeTopFocus logHook This is required to make IntelliJ (and supposedly all other Swing applications) properly notice that they've recieved the focus. According to [0], the problem is that "xmonad does not follow ICCCM and ignores WM_TAKE_FOCUS protocol", but the patches on that ticket haven't yet been accepted, so the function was added to xmonad-contrib as a workaround until something happens in xmonad proper. [0]: http://code.google.com/p/xmonad/issues/detail?id=177
author Augie Fackler <durin42@gmail.com>
date Wed, 02 Nov 2011 09:53:57 -0500
parents a5ec16bba8a9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
261
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 # This is broken into its own file on account of not being able to
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 # properly make opendiff-w bail when opendiff is unavailable.
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 [merge-tools]
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 filemerge.priority = 100
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 filemerge.executable = opendiff-w
a5ec16bba8a9 hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 filemerge.args = $local $other -ancestor $base -merge $output