Documentation: merge: add an overview
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:42:46 +0000 (03:42 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100)
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>
No differences found