************************************************************
***** NOTE: THIS BUG TRACKER IS FOR GERRIT CODE REVIEW *****
***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, INTERNAL *****
***** ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC. *****
***** THOSE ISSUE BELONG IN DIFFERENT ISSUE TRACKERS! *****
************************************************************
Affected Version: master
What steps will reproduce the problem?
1. merge from stable into master, introducing a merge conflict
2. resolve the merge conflicts with git mergetool
3. build with buck
What is the expected output? What do you see instead?
Temporary files generated during the conflict resolution are included in the buck build, which causes the build to fail.
Please provide any additional information below.