Mercurial > dotfiles
comparison .ipython/ipy_user_conf.py @ 195:e1a49db5c6ff
git-next-unmerged-file: also include "both modified" files
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Tue, 06 Apr 2010 15:07:46 -0500 |
parents | c1519e52dcd0 |
children |
comparison
equal
deleted
inserted
replaced
194:cf3ba8f57434 | 195:e1a49db5c6ff |
---|