From f6955172fe4ea8e7a153bc5d1c0b98ee189866f3 Mon Sep 17 00:00:00 2001
From: Luke Sampson <me@lukesampson.com>
Date: Fri, 12 Jul 2013 17:34:49 +1000
Subject: [PATCH] TortoiseMerge 1.6.7, WinMerge 2.14.0

---
 tortoisemerge.json | 12 ++++++++++++
 winmerge.json      |  8 ++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 tortoisemerge.json
 create mode 100644 winmerge.json

diff --git a/tortoisemerge.json b/tortoisemerge.json
new file mode 100644
index 0000000000..2e323062e8
--- /dev/null
+++ b/tortoisemerge.json
@@ -0,0 +1,12 @@
+{
+	"version": "1.6.7",
+	"license": "GPL",
+	"url": "http://downloads.sourceforge.net/project/tortoisesvn/Tools/1.6.7/TortoiseDiff-1.6.7.zip",
+	"hash": "sha256:f530dc5d460ca6e27912bee68a8a5dc54a2e9263ac6e932438240571f92515fa",
+	"bin": ["tortoisemerge.exe"],
+	"post_install":
+		"try { $null = gcm git -ea stop; git config --global mergetool.tortoisemerge.path $(scoop which tortoisemerge) } catch { }",
+	"notes": "If you would like to use TortoiseMerge with Git, run:
+
+	git config --global merge.tool tortoisemerge"
+}
\ No newline at end of file
diff --git a/winmerge.json b/winmerge.json
new file mode 100644
index 0000000000..8b49d5b3cf
--- /dev/null
+++ b/winmerge.json
@@ -0,0 +1,8 @@
+{
+	"version": "2.14.0",
+	"license": "GPL2",
+	"url": "http://downloads.sourceforge.net/project/winmerge/stable/2.14.0/WinMerge-2.14.0-exe.zip",
+	"hash": "sha256:9c77580ff9594536ce84dbbf0095e4b8654892a713989c378b9349c833c0f177",
+	"unzip_folder": "WinMerge-2.14.0-exe",
+	"bin": "WinMergeU.exe"
+}
\ No newline at end of file