Public Git Hosting - TortoiseGit.git/commit

commit	c5e8d0dc2b05a2f2cb334d3e67e5d95962a7c0fd
author	Sven Strickroth <email@cs-ware.de>
	Sun, 21 Jan 2018 21:10:02 +0000 (21 22:10 +0100)
committer	Sven Strickroth <email@cs-ware.de>
	Sun, 21 Jan 2018 21:29:03 +0000 (21 22:29 +0100)
tree	fac29140849b8d52395a9b082199e5d12633458a	tree \| snapshot (tar.gz zip)
parent	ed3fcea4feb6db163604fda674cccc4743d1fe7d	commit \| diff

Add note for new users that a merge conflict requires a commit

Signed-off-by: Sven Strickroth <email@cs-ware.de>

Windows Explorer Extension to Operate Git

Languages/Tortoise.pot		diff \| blob \| blame \| history
src/Resources/TortoiseProcENG.rc		diff \| blob \| blame \| history
src/TortoiseProc/AppUtils.cpp		diff \| blob \| blame \| history
src/TortoiseProc/Settings/SetSavedDataPage.cpp		diff \| blob \| blame \| history
src/TortoiseProc/SyncDlg.cpp		diff \| blob \| blame \| history
src/TortoiseProc/resource.h		diff \| blob \| blame \| history