annotate .zfun/_mercurial @ 359:76cd5cf09b44

Merge.
author Augie Fackler <raf@durin42.com>
date Thu, 08 Jan 2015 16:22:36 -0500
parents 4e25b698e3e3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
293
4e25b698e3e3 _hg: symlink as _mercurial as well to fix weird behavior on Ubuntu
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 _hg