From 15d736fd5111c342ee952984386d9bb6c6a4c92b Mon Sep 17 00:00:00 2001
From: Iristyle <Iristyle@github>
Date: Wed, 3 Apr 2013 12:57:14 -0400
Subject: [PATCH] fix(EthanBrown.GitConfiguration): DiffMerge title

 - Mine / Theirs was reversed
---
 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 0178014..a4223d9 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=\"Mine\" --title2=\"Merging to: $MERGED\" --title3=\"Theirs\"'
+  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.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)\"'