?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: b44bf2b) | patch
Improve documentation for conflict resolution
commit03074a595d8113d40b3f4fbaf4b0c54a8cc73976
authorSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 19:40:00 +0000 (21 20:40 +0100)
committerSven Strickroth <email@cs-ware.de>
Fri, 21 Nov 2014 20:00:59 +0000 (21 21:00 +0100)
tree85efb838976b7228177734af1c46bc33abc38364tree | snapshot (tar.gz zip)
parentb44bf2bb94acc754db14cee7c696971a2f007795commit | diff
Improve documentation for conflict resolution

Signed-off-by: Sven Strickroth <email@cs-ware.de>
doc/images/en/resolve-delete-modify-conflict.png [new file with mode: 0644] blob
doc/images/en/resolve-submodule-conflict.png [new file with mode: 0644] blob
doc/source/en/TortoiseGit/tgit_dug/dug_conflicts.xml diff | blob | blame | history
src/Resources/TortoiseProcENG.rc diff | blob | blame | history
src/TortoiseProc/DeleteConflictDlg.cpp diff | blob | blame | history
Windows Explorer Extension to Operate Git