diff tests/test-merge-tools.t @ 15957:12a1c9e92d66 stable

update: note ways to avoid moving bookmark
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 19 Jan 2012 16:10:26 -0600
parents 2607de602105
children cdbb53a640c1
line wrap: on
line diff