Mercurial > dotfiles

annotate unixSoft/hgrc-opendiff @ 351:bef29d49d19f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
safe-paste: adds support for bracketed paste mode to zsh Since I don't use oh-my-zsh, just import their code directly with a reference. Based on the site where I learned about this [0], it's originally from [1], and I downloaded it from [2]. 0: https://cirw.in/blog/bracketed-paste 1: http://www.zsh.org/mla/users/2011/msg00367.html 2: https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/plugins/safe-paste/safe-paste.plugin.zsh
author Augie Fackler <raf@durin42.com>
date Mon, 10 Nov 2014 09:26:04 -0500
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