From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat, 23 Jan 2010 09:42:46 +0000 (-0600)
Subject: Documentation: merge: add an overview
X-Git-Tag: v1.7.0-rc0~7^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b40bb374a618534b930ce4da5ffffb215b5cb488?ds=sidebyside;hp=b40bb374a618534b930ce4da5ffffb215b5cb488

Documentation: merge: add an overview

The reader unfamiliar with the concepts of branching and merging
would have been completely lost.  Try to help him with a diagram.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---