Mercurial > dotfiles
view unixSoft/hgrc-opendiff @ 261:a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 16 Aug 2010 12:30:39 -0500 |
parents | |
children |
line wrap: on
line source
# This is broken into its own file on account of not being able to # properly make opendiff-w bail when opendiff is unavailable. [merge-tools] filemerge.priority = 100 filemerge.executable = opendiff-w filemerge.args = $local $other -ancestor $base -merge $output