threads / discuss / 18654

diff: unmerged path?

Subject: diff: unmerged path?

## tl;dr

One message between Mar 31, 2009 and Mar 31, 2009.

replies: 0people: 1as markdown or json

Jon Smirl· Mar 31, 2009, 02:47 UTC · lore

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.