Public Git Hosting - TortoiseGit.git/commit

commit	6153df9127d5924b9d13eca568a04d194741b590
author	Sven Strickroth <email@cs-ware.de>
	Wed, 5 Jul 2017 17:55:06 +0000 (5 19:55 +0200)
committer	Sven Strickroth <email@cs-ware.de>
	Wed, 5 Jul 2017 19:48:07 +0000 (5 21:48 +0200)
tree	5ea62cb64be5f5266a65b6587f5fcc073e1e25e1	tree \| snapshot (tar.gz zip)
parent	464c0c72b0e09096a41bf0c19e19fe2c2de5830c	commit \| diff

TGitMerge: Don't use theirs/mine

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

Windows Explorer Extension to Operate Git

Languages/Tortoise.pot		diff \| blob \| blame \| history
src/Resources/TortoiseMergeENG.rc		diff \| blob \| blame \| history
src/Resources/ribbon.mfcribbon-ms		diff \| blob \| blame \| history
src/TortoiseMerge/MainFrm.cpp		diff \| blob \| blame \| history
src/TortoiseMerge/WorkingFile.cpp		diff \| blob \| blame \| history
src/TortoiseMerge/WorkingFile.h		diff \| blob \| blame \| history