comparison tests/test-i18n.t @ 13874:9d67277c9204

merge: add ancestor to the update function This makes it easier to do rebase-like operations.
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Apr 2011 15:25:20 -0500
parents bb107a31820e
children f85c9b0fdb32
comparison
equal deleted inserted replaced
13873:02c3d4d44a92 13874:9d67277c9204