From 8972c211f1ac2c4865f5448beceb5cc3db594a28 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 30 Jan 2018 16:50:59 +0000
Subject: [PATCH] ide: SVN conflict resolving tools

git-svn-id: svn://ultimatepp.org/upp/trunk@11751 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/idebar.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index fb919e7a5..c0b09e257 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -511,6 +511,19 @@ void Ide::FilePropertiesMenu(Bar& menu)
 						bar.Add("Compare current <-> theirs", [=] { DiffFiles("current", editfile, "theirs", theirs); });
 					if(original.GetCount())
 						bar.Add("Compare current <-> original", [=] { DiffFiles("current", editfile, "original", original); });
+					bar.Separator();
+					bar.Add("Use mine", [=] {
+						if(PromptYesNo("Do you want to overwrite current with [* mine]?")) {
+							SaveFile();
+							Upp::SaveFile(editfile, LoadFile(mine));
+						}
+					});
+					bar.Add("Use theirs", [=] {
+						if(PromptYesNo("Do you want to overwrite current with [* theirs]?")) {
+							SaveFile();
+							Upp::SaveFile(editfile, LoadFile(theirs));
+						}
+					});
 				});
 			}
 		}