Merge branch 'master' of https://github.com/winmerge/winmerge into jp

author Takashi Sawanaka <sdottaka@users.sourceforge.net>

Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)

committer Takashi Sawanaka <sdottaka@users.sourceforge.net>

Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)
author Takashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)
committer Takashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)
diff --cc .gitignore
Simple merge
diff --cc Src/MainFrm.cpp
Simple merge
diff --cc Src/MainFrm.h
Simple merge
diff --cc Src/Merge.rc
Simple merge
diff --cc Src/resource.h
Simple merge
author	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)
committer	Takashi Sawanaka <sdottaka@users.sourceforge.net>
	Tue, 26 May 2020 23:05:04 +0000 (08:05 +0900)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Src/MainFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/MainFrm.h	patch \|	diff1 \|	diff2 \|	blob \| history
Src/Merge.rc	patch \|	diff1 \|	diff2 \|	blob \| history
Src/resource.h	patch \|	diff1 \|	diff2 \|	blob \| history