diff: unmerged path?

From: Jon Smirl <hidden>
Date: 2016-06-15 22:46:31

What does it mean when I have an unmerged path?

jonsmirl@terra:/home/apps/u-boot$ git diff
* Unmerged path api_examples/intellon.c
jonsmirl@terra:/home/apps/u-boot$

api_examples/intellon.c is a newly created file under stgit.

-- 
Jon Smirl
jonsmirl@gmail.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help