index 666349d178f071363f317e9a477a19e68bd23b7b..678bfd3cdeb1e223138438431bd46257ec8adcea 100644 (file)
This displays diffs for the current state of the resolution. It is
useful for tracking what has changed while the user is resolving
conflicts. Additional arguments are passed directly to the system
-`diff` command installed in PATH.
+'diff' command installed in PATH.
'status'::