dev/net/uprev: Remove dependency on imerge, add ability to compile
imerge can be difficult to understand, and failures can be hard to
debug. Use git merge/ git merge --abort to perform a non conflicting
merge.
Add flag to compile on dedede and trogdor.
Add flag to merge until next conflict on current repo.
BUG=None
TEST=go run ~/trunk/src/platform/dev/net/uprev/uprev_script.go
Change-Id: Ie1a418e94aef8a9e51ddc58b1680fde66c56d94d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3862403
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Pavan Holla <pholla@google.com>
Tested-by: Pavan Holla <pholla@google.com>
1 file changed
