| commit | 433b7b10955713da884cfc895845f541f03ce682 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 7 Dec 2011 14:58:41 +0000 (7 15:58 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 7 Dec 2011 14:58:41 +0000 (7 15:58 +0100) | ||
| tree | 6fec0001ea713cd323859ed0e2c5cde046dd41fb | treesnapshot (tar.gz zip) |
| parent | 62e5cd51f24c70aad7b75cb220b45ea6b19d32fc | commitdiff |
better document resolving conflicts
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| doc/images/en/ResolveConflict.png | [new file with mode: 0644] | blob |
| doc/source/en/TortoiseGit/tsvn_dug/dug_conflicts.xml | diffblobblamehistory |
