conorjh

Just another WordPress.com site

Archive for the month “August, 2012”

http://davestechshop.net/blog/dave/how-to-configure-trackpoint-for-ubuntu-jaunty-or-intrepid

Advertisements

Using emacs/emerge to merge in mercurial

add what’s below to your .hgrc file


[ui]
merge = emacs

[merge-tools]
emacs.args = -q --eval "(emerge-files-with-ancestor nil \"$local\" \"$other\" \"$base\" \"$output\" nil 'kill-emacs)"

http://mercurial.selenic.com/wiki/MergingWithEmacs

Post Navigation