diff tests/test-uncommit.t @ 776:7eaad1101242

raise util.Abort instead of assertion when trying to evolve a merge changeset. This prevent exposing a nasty traceback to the user.
author Arne Babenhauserheide <arne.babenhauserheide@kit.edu>
date Mon, 20 Jan 2014 10:57:10 +0100
parents a5474648a9d2
children 89b50258ad33
line wrap: on
line diff