aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '0928fbaff8'
${ noResults }
depot_tools/man
History
sammc@chromium.org 8990189aed Support merging with conflicts with git-drover. 
Currently, git-drover gives up and cleans up if the cherry-pick fails.
This change allows the user to manually resolve conflicts when using
git-drover.

BUG=404755

Review URL: https://codereview.chromium.org/1397313002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297429 0039d316-1c4b-4281-b951-d872f2087c98
 		9 years ago
..
html Support merging with conflicts with git-drover. 9 years ago
man1 Support merging with conflicts with git-drover. 9 years ago
man7 Fixed ``smart'' quotes in code block. 10 years ago
src Support merging with conflicts with git-drover. 9 years ago
push_to_gs.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 11 years ago