@node VC Mode Line
@subsection Version Control and the Mode Line
+@cindex VC, mode line indicator
When you visit a file that is under version control, Emacs indicates
this on the mode line. For example, @samp{Bzr-1223} says that Bazaar
The character between the back-end name and the revision ID
indicates the status of the work file. In a merge-based version
control system, a @samp{-} character indicates that the work file is
-unmodified, and @samp{:} indicates that it has been modified. In a
-lock-based system, @samp{-} indicates an unlocked file, and @samp{:} a
-locked file; if the file is locked by another user (for instance,
-@samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
+unmodified, and @samp{:} indicates that it has been modified.
+@samp{!} indicates that the file contains conflicts as result of a
+recent merge operation (@pxref{Merging}), or that the file was removed
+from the version control. Finally, @samp{?} means that the file is
+under version control, but is missing from the working tree.
+
+ In a lock-based system, @samp{-} indicates an unlocked file, and
+@samp{:} a locked file; if the file is locked by another user (for
+instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}.
+@samp{@@} means that the file was locally added, but not yet committed
+to the master repository.
On a graphical display, you can move the mouse over this mode line
indicator to pop up a ``tool-tip'', which displays a more verbose
@ifnottex
@include emerge-xtra.texi
@end ifnottex
-