[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way di
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way diff |
Date: |
Wed, 17 May 2017 08:13:45 -0400 (EDT) |
branch: scratch/add-vdiff
commit 97d709873f4fdc678a20f8b2fe6bc2f758508491
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Add screenshot of three way diff
---
README.org | 4 ++++
img/leuven3.png | Bin 0 -> 84381 bytes
2 files changed, 4 insertions(+)
diff --git a/README.org b/README.org
index 71504f8..464b424 100644
--- a/README.org
+++ b/README.org
@@ -27,8 +27,12 @@ find. Contributions and suggestions are very welcome.
** Screenshot
+*** Basic two file diff
[[./img/leuven.png]]
+*** Three file diff with targets for sending changes
+[[./img/leuven3.png]]
+
** Installation and Usage
vdiff was recently added to MELPA, which is the recommended way to install it
diff --git a/img/leuven3.png b/img/leuven3.png
new file mode 100644
index 0000000..0c711f0
Binary files /dev/null and b/img/leuven3.png differ
- [elpa] scratch/add-vdiff 309e912 108/258: Refresh automatically on idle after change, (continued)
- [elpa] scratch/add-vdiff 309e912 108/258: Refresh automatically on idle after change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdiff-files, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 750a1bc 124/258: Fix bug in remove-refinements, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c8cba47 125/258: Fix package, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 83f0788 118/258: Don't make temp files global, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 72fe0fa 130/258: Don't update diff info while sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvol/master, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5dcdc97 158/258: Remove other-window, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way diff,
Justin Burkett <=
- [elpa] scratch/add-vdiff 8b79246 171/258: Make sure we're in a vdiff buffer on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 42f56ae 177/258: Don't jump to beginning of buffer on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way diff on quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 71d1d20 169/258: Add overlay markers to diff3 send/receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fef3208 189/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 03e1b64 186/258: Remove unnecessary unique name function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold on close, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d3faef0 197/258: Refresh manually after receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a88d313 200/258: Sync scroll after fold toggle, Justin Burkett, 2017/05/17