diff options
author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-23 03:42:46 -0600 |
---|---|---|
committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-24 13:57:42 +0100 |
commit | b40bb374a618534b930ce4da5ffffb215b5cb488 (patch) | |
tree | 30959fdf1e176374bf7d24aee9c3f273e14334df /ws.c | |
parent | a4081bacfc78c1e1843590ed8d87544f3873dd10 (diff) | |
download | git-b40bb374a618534b930ce4da5ffffb215b5cb488.tar.gz |
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>
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions