diff tests/test-context.py @ 11452:eac141407b85 stable

merge: document how to 'undo' a merge
author Matt Mackall <mpm@selenic.com>
date Sun, 27 Jun 2010 17:41:43 -0500
parents a1aad8333864
children bd23d5f28bbb
line wrap: on
line diff