From 2b71d04ec90bbbf04f0bd87b39df0ae06adc89d4 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 23 May 2010 15:30:01 +0800
Subject: [PATCH] Fixed issue #221: After resolving all merge conflicts, it's
 not obvious the project needs a commit

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc | Bin 455766 -> 455980 bytes
 src/TortoiseProc/ResolveDlg.cpp  |   1 +
 src/TortoiseProc/resource.h      | Bin 168668 -> 168760 bytes
 3 files changed, 1 insertion(+)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 683ce97b8e84fe6b9355a136dc565444f8a36677..da9c39758befadd0e0d7eaa83581e8339383817d 100644
GIT binary patch
delta 254
zcwW2qLVC?B>4q(g%T_a6Fj!80m}Wiw02|Yl?K{>mmM}7#Gnh`-U&nZz(PH|<U}n+j
z4@?*>7)_@uZeWz0ZeYq7z-S3!AK1s}#%#=B1mOjoV=@rWWXNMkVMt{tVz6RRU~p#0
zXUGM@%;_5!u}DiQFeEahF_eI%6@WOEp%|zjhoNlxK}Tk3&3J|&23H1O22Tb*1{WYJ
zh(U+Jkii%TL9`)*C73n=x_9A0`SySfjN1b?FnN?r+t0?vTEI}sP%^!78MEm2RVvK)
f&P<PRVM&<2!GOh}UE&in5VHU=>voAxY<5flhlNQ8

delta 117
zcwPZ@0E+*t>KoSR8-TO{rmL6G{Q?RDH2^cW;Y9%n0hi8D0t%O|Ck6($%&Y-m0k^zF
z0x$uWD6jz<m(VH!Mw8@fl!q9x0k;^j0!Vb0vjGH`2D1VVw}2%B-prRSD+FQzG?(!P
X1TBZ|@&kwN@&t$O@&&i<@&-Nvt~oCa

diff --git a/src/TortoiseProc/ResolveDlg.cpp b/src/TortoiseProc/ResolveDlg.cpp
index a38e0f95a..d1aa002b8 100644
--- a/src/TortoiseProc/ResolveDlg.cpp
+++ b/src/TortoiseProc/ResolveDlg.cpp
@@ -70,6 +70,7 @@ BOOL CResolveDlg::OnInitDialog()
 	AddAnchor(IDOK, BOTTOM_RIGHT);
 	AddAnchor(IDCANCEL, BOTTOM_RIGHT);
 	AddAnchor(IDHELP, BOTTOM_RIGHT);
+	AddAnchor(IDC_STATIC_REMINDER, BOTTOM_RIGHT);
 	if (hWndExplorer)
 		CenterWindow(CWnd::FromHandle(hWndExplorer));
 	EnableSaveRestore(_T("ResolveDlg"));
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index 7a989b83ed793e436d3d0dd9ad3be2cfcaf99567..7fed90293d0d31649801b40235264cde9aa49008 100644
GIT binary patch
delta 64
zcwPZO0Kfm-r3$#F3V^f$TAY`#QvnzQNdQilaV7#2lb|9Flkf}#ms*kn7?;q30Uoz>
WoB`(bmolIM7?)m=0u+~qk^)v0r5F+b

delta 32
qcwPY@0N?+(rV8Ap3V^f$TAY{ghyfb6(3}D0^_QBQ0T`Fgk^*W5Mh}qy

-- 
2.11.4.GIT