Add "--unmerged" flag to "show-files", which does what the name implies.
commiteec8c633c117c83a9fd2be7054b169d3cee5806d
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 19:43:32 +0000 (16 12:43 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 19:43:32 +0000 (16 12:43 -0700)
tree59c9ea857e563de5e3bb27f0cb6133a6f22c8964
parent2fbdd1317480d2f14756d94e41a8eb07442d4841
Add "--unmerged" flag to "show-files", which does what the name implies.

The flag also implies "--stage", since unmerged file information doesn't
make sense without the full output.
show-files.c