| commit | eb35a352bda99c7169f443001892b4dfc74cb87d | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Tue, 25 Oct 2011 21:09:56 +0000 (25 23:09 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Tue, 25 Oct 2011 21:09:56 +0000 (25 23:09 +0200) | ||
| tree | 64e8d286ebde0b040bcb324bf70a453bc6ddce6e | treesnapshot (tar.gz zip) |
| parent | d4d68e86a7c36c70667afe05607eec6e3aa31f6c | commitdiff |
Fixed issue #486: Resolving conflicts can result in nothing to commit and branch merge not concluded
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/Git/TGitPath.cpp | diffblobblamehistory | |
| src/Git/TGitPath.h | diffblobblamehistory | |
| src/TortoiseProc/CommitDlg.cpp | diffblobblamehistory |