diff en/figs/tour-merge-conflict.svg @ 810:1a0a78e197c3

Incorporate feedback from Greg Lindahl.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri, 24 Apr 2009 00:27:05 -0700
parents bebd5ff7fe7f
children
line wrap: on
line diff