Mercurial > dotfiles

annotate unixSoft/hgrc-opendiff @ 485:e4d4cd0d120e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zsh: start using mcfly for ^R history search This is a modified version of mcfly.zsh from upstream 422557e1ba48c33c5753262bd294bf3e92a40476. I then expect to install mcfly using cargo.
author Augie Fackler <raf@durin42.com>
date Tue, 30 Jun 2020 10:37:13 -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