| commit | f0481be4c9039d0186f72d7c1c7e90bceec402a0 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Mon, 27 Oct 2014 19:12:59 +0000 (27 20:12 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Fri, 31 Oct 2014 16:47:24 +0000 (31 17:47 +0100) | ||
| tree | e2a6230874497b9331b7f4d8a932f85783a853f8 | treesnapshot (tar.gz zip) |
| parent | e9572116455b89bba2befcf831770c066a7fa34a | commitdiff |
Add resolve submodule conflict dialog
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>