Mercurial > dotfiles
diff .emacs @ 338:3f3d52956ff7
hgrc: use detailed merge markers by default
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 18 Jul 2014 20:15:41 -0400 |
parents | 2a4efba0fe8b |
children | 7edfa8d22584 |
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 18 Jul 2014 20:15:41 -0400 |
parents | 2a4efba0fe8b |
children | 7edfa8d22584 |