Mercurial > dotfiles
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 260:26f9c18b588c | 261:a5ec16bba8a9 |
|---|---|
| 1 # This is broken into its own file on account of not being able to | |
| 2 # properly make opendiff-w bail when opendiff is unavailable. | |
| 3 [merge-tools] | |
| 4 filemerge.priority = 100 | |
| 5 filemerge.executable = opendiff-w | |
| 6 filemerge.args = $local $other -ancestor $base -merge $output |