OSDN Git Service

Show "Merged" status for merged file.
authorFrank Li <lznuaa@gmail.com>
Thu, 14 May 2009 15:02:52 +0000 (23:02 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 14 May 2009 15:20:53 +0000 (23:20 +0800)
commitccf29822955978a7a84c9e11d46a844b9eeb77b1
tree4b30cc1f7997d53c340345a87f1d2427be953ee9
parent1a001428212883d1073068bf85d4b279aa446296
Show "Merged" status for merged file.

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