Add new advance option RefreshFileListAfterResolvingConflict
commitc2ab11a179d9b02b40a66c0aae108ffadbc9147a
authorSven Strickroth <email@cs-ware.de>
Sat, 14 Feb 2015 20:05:41 +0000 (14 21:05 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 15 Feb 2015 13:26:55 +0000 (15 14:26 +0100)
treee7f6ff25698e0b7c4cd214cbabe498ed498d74f5
parent1379434bdf753c6272c7fb2d0ddd70b7e2c0ef58
Add new advance option RefreshFileListAfterResolvingConflict

This fixes issue #2417 and also mitigates issue #1949.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
doc/source/en/TortoiseGit/tgit_dug/dug_settings_advanced.xml
src/Changelog.txt
src/Git/GitStatusListCtrl.cpp
src/TortoiseProc/Commands/ResolveCommand.cpp
src/TortoiseProc/Settings/SettingsAdvanced.cpp