Mercurial > hg
comparison mercurial/merge.py @ 5865:e7127f669edb
transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 16 Jan 2008 11:32:25 -0600 |
parents | c704b03884ef |
children | 7855b88ba838 |
comparison
equal
deleted
inserted
replaced
5864:88783c8b5660 | 5865:e7127f669edb |
---|