OSDN Git Service

Add Resolve "Their" and Resolve "Mine" at conflict item.
authorFrank Li <lznuaa@gmail.com>
Thu, 6 Aug 2009 16:02:53 +0000 (00:02 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 6 Aug 2009 16:02:53 +0000 (00:02 +0800)
commit898c86f351e5c63a8a238734d3d4171648fdfe8a
tree62d8394b6742ba732d313aaa2db27af0fbba9667
parent9bc8642b1ba7d10ad455bf9b0ce5a819f7e87f01
Add Resolve "Their" and Resolve "Mine" at conflict item.

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