Mercurial > dotfiles

annotate unixSoft/hgrc-opendiff @ 480:4c5814d3cfd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
afcopy: some enhancements from Bryan's dotfiles This makes `afcopy` able to drop things in the clipboard over ssh. Wild stuff. See https://bitbucket.org/bcmills/dotfiles/src/101956eeb90160f1d225ae23c8e6566c9df91c5c/bin/clip?at=default&fileviewer=file-view-default for some details.
author Augie Fackler <raf@durin42.com>
date Thu, 14 Mar 2019 10:38:49 -0400
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