| commit | 1aca636da79028349bb7bc39d4bcaddb7e9f6396 | |
| author | Frank Li <lznuaa@gmail.com> | |
| Thu, 22 Jan 2009 16:13:29 +0000 (23 00:13 +0800) | ||
| committer | Frank Li <lznuaa@gmail.com> | |
| Thu, 22 Jan 2009 16:13:29 +0000 (23 00:13 +0800) | ||
| tree | 25e624f356c6b5b1a0f1678fca37829ef1fb3c2f | treesnapshot (tar.gz zip) |
| parent | a2c8b7d75cd39285cd1e65b3e0bb10a3ae849c33 | commitdiff |
Commit dialog support check conflict and mark resolve function.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Frank Li <lznuaa@gmail.com>