From e014a6ba28f7363cbbf0e89a0915196966e73abf Mon Sep 17 00:00:00 2001
From: "Ethan J. Brown" <ethan_j_brown@hotmail.com>
Date: Thu, 22 Aug 2013 18:35:27 -0700
Subject: [PATCH] fix (GitConfiguration): Mine / Theirs reversed for DiffMerge

---
 EthanBrown.GitConfiguration/tools/chocolateyInstall.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EthanBrown.GitConfiguration/tools/chocolateyInstall.ps1 b/EthanBrown.GitConfiguration/tools/chocolateyInstall.ps1
index a4223d9..0178014 100644
--- a/EthanBrown.GitConfiguration/tools/chocolateyInstall.ps1
+++ b/EthanBrown.GitConfiguration/tools/chocolateyInstall.ps1
@@ -2,7 +2,7 @@ $package = 'EthanBrown.GitConfiguration'
 
 try {
   # Set up git diff/merge tool
-  git config --global mergetool.DiffMerge.cmd '\"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" --title1=\"Theirs\" --title2=\"Merging to: $MERGED\" --title3=\"Mine\"'
+  git config --global mergetool.DiffMerge.cmd '\"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\" --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" --title1=\"Mine\" --title2=\"Merging to: $MERGED\" --title3=\"Theirs\"'
   git config --global mergetool.DiffMerge.trustExitCode true
   git config --global difftool.DiffMerge.cmd '\"C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe\"  \"$LOCAL\" \"$REMOTE\" --title1=\"Previous Version ($LOCAL)\" --title2=\"Current Version ($REMOTE)\"'