diff contrib/simplemerge @ 4410:bbc97d419b16

Add fast-forward branch merging
author Brendan Cully <brendan@kublai.com>
date Sun, 06 May 2007 20:27:45 -0700
parents 1ef4445c6506
children ea7b982b6c08
line wrap: on
line diff