github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: SVN conflict resolving tools

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11751 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-01-30 16:50:59 +00:00
parent 221c155ea2
commit 8972c211f1
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/ide/idebar.cpp
View file

@ -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));
}
});
});
}
}