| commit | a872e757cb0d13ff638adfe66dd315d8cbfb5f15 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]> | Tue Apr 28 23:42:18 2015 |
| committer | [email protected] <[email protected]> | Tue Apr 28 23:42:18 2015 |
| tree | 67b86c4cd48e5a9aad122896bc42440146353447 | |
| parent | 445c896d9f750fb9f3a0956a379531b2c7c55e3b [diff] |
Don't clean up after conflict in "git cl patch" After crrev.com/896453002, if "git cl diff" ends up having conflict, it would be cleaned up. However, if "git cl patch" ends up with conflict, the user should still be able to manually resolve them. BUG=438362 TEST=tests/git_cl_test.py Review URL: https://codereview.chromium.org/1091283004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295051 0039d316-1c4b-4281-b951-d872f2087c98