log en/tour-merge-merge.svg @ 290:b0db5adf11c1 ja_root

age author description
Wed, 18 Oct 2006 14:11:51 -0700 Bryan O'Sullivan A few bits of terminological clarification.
Wed, 18 Oct 2006 12:06:56 -0700 Bryan O'Sullivan Add yet another illustration of the merge process. base en/tour-merge-pull.svg@7b6bdb14e38f