view hg @ 100:06ab5f0f9c28

dumpshot: mindlessly dumps shot*.png files produced by mplayer.
author Edho Prima Arief <edho@myconan.net>
date Tue, 19 Jul 2011 15:43:36 +0700
parents e17886c8da43
children ed3d1b8e6f45
line wrap: on
line source

[ui]
username = Edho Prima Arief <edho@myconan.net>
merge = vimdiff
verbose = true

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close

[extensions]
#hgext.convert = 
#progress =