Mercurial > dotfiles.old

comparison templates/git/hooks/post-merge @ 31:faf7781dae42

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only show conflict markers when more than 3 <
author zegervdv <zegervdv@me.com>
date Tue, 01 Apr 2014 20:56:02 +0200
parents a8279f1d5b39
children
comparison
equal deleted inserted replaced
30:7dfc911400a3 31:faf7781dae42