OSDN Git Service

Show Conflict Status at Filelist at delete conflict local: delete, remote:modified
authorFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 15:19:55 +0000 (23:19 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 27 Feb 2009 15:19:55 +0000 (23:19 +0800)
commit4df3212b96b298f411e9ff4083e81363588c8b47
tree6b8f103b1392dfadd44234a246d3cf39de2bf0c2
parentd7a9c05ca0e619745717aed22cdc0067ebc619aa
Show Conflict Status at Filelist at delete conflict local: delete, remote:modified

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp
src/Git/TGitPath.cpp
src/TortoiseProc/AppUtils.cpp