Bruce Ashfield 80a74318de kern-tools: re-enable scc merge command ...

The ability to merge two branches directly from a .scc file was
dropped during the streamlining of the tools.

As was pointed out by David Vincent <freesilicon@gmail.com>, there is
once again a valid use case for this functionality, so we restore the
capability.

(From OE-Core rev: a0059ebbb52c659282e355664bba1a2fa282170e)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2017-02-05 09:22:17 +00:00

..

kern-tools-native_git.bb

kern-tools: re-enable scc merge command

2017-02-05 09:22:17 +00:00