| commit | 85f78389631d9e398799624a40d8b1e822e3bf51 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Sun, 10 Mar 2013 23:12:26 +0000 (11 00:12 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Mon, 11 Mar 2013 11:34:48 +0000 (11 12:34 +0100) | ||
| tree | ee53b1eb8f675930f5d24eb6dcad8da507b7b6b5 | treesnapshot (tar.gz zip) |
| parent | 365b0a4ff782451c791e5f928971205279901111 | commitdiff |
RebaseDlg: Improved error handling on conflict handling
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseProc/RebaseDlg.cpp | diffblobblamehistory |