Add overview gif and tab images

christoomey · Jan 12, 2014 · b3d5661 · b3d5661
1 parent 0170c29
commit b3d5661
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,8 @@ Bundle 'christoomey/vim-conflicted'
 Overview
 --------
 
+![](./images/overview.gif)
+
 ### Versions
 
 Conflicted makes reference to four different versions of each conflicted
@@ -114,9 +116,17 @@ diff view presented:
 
 1. **Gdiff 3-way** - 3 way diff comparing the upstream, working, and local
    versions of the file.
+
+![Tab 1 - Working](./images/tab1.png)
+
 1. **Upstream Changes** - A 2 way diff between the base and upstream versions
    of the file.
+
+![Tab 2 - Upstream](./images/tab2.png)
+
 1. **Local Changes** - A 2 way diff between the base and local versions of
    the file.
 
+![Tab 3 - Local](./images/tab3.png)
+
 [Vundle]: https://github.com/gmarik/vundle
diff --git a/images/overview.gif b/images/overview.gif
diff --git a/images/tab1.png b/images/tab1.png
diff --git a/images/tab2.png b/images/tab2.png
diff --git a/images/tab3.png b/images/tab3.png