?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 9bc8642) | patch
Add Resolve "Their" and Resolve "Mine" at conflict item.
commit898c86f351e5c63a8a238734d3d4171648fdfe8a
authorFrank Li <lznuaa@gmail.com>
Thu, 6 Aug 2009 16:02:53 +0000 (7 00:02 +0800)
committerFrank Li <lznuaa@gmail.com>
Thu, 6 Aug 2009 16:02:53 +0000 (7 00:02 +0800)
tree62d8394b6742ba732d313aaa2db27af0fbba9667tree | snapshot (tar.gz zip)
parent9bc8642b1ba7d10ad455bf9b0ce5a819f7e87f01commit | diff
Add Resolve "Their" and Resolve "Mine" at conflict item.

Signed-off-by: Frank Li <lznuaa@gmail.com>
src/Git/GitStatusListCtrl.cpp diff | blob | blame | history
Windows Explorer Extension to Operate Git