diff mercurial/merge.py @ 11444:b9a46acdfe1f stable

bookmarks: fix in/out return values
author Matt Mackall <mpm@selenic.com>
date Sat, 26 Jun 2010 12:26:03 -0500
parents 6f1d1ed3e19a
children 51021f4c80b5
line wrap: on
line diff