From f76336a8fecbb626accdbf6f7e6ba9f86293d482 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Wed, 23 May 2012 16:12:39 -0700 Subject: figures --- figures/git-merge-ok.svg | 769 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 769 insertions(+) create mode 100644 figures/git-merge-ok.svg (limited to 'figures/git-merge-ok.svg') diff --git a/figures/git-merge-ok.svg b/figures/git-merge-ok.svg new file mode 100644 index 0000000..31ec423 --- /dev/null +++ b/figures/git-merge-ok.svg @@ -0,0 +1,769 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Commit C + + + + Commit D + + + + Commit B + + + + git pull + + + Commit E + + + + + + + + + + Merge + + + + Commit A + + + + + + -- cgit v1.2.3-70-g09d2