--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev
Could I just manually hack so it ignores the "nobase" for the one file I care about?
You could probably hack it by
1) git checkout -b hack origin
2) echo >> chrome/renderer/chrome_content_renderer_client.cc
3) git commit -am hack
4) git checkout my-original-branch
5) git merge hack
6) git cl upload hack
This will use the file with the extra trailing newline as the "base" file.