>>>>> "jam" == John A Meinel <email address hidden> writes:
jam> Vincent Ladeuil wrote:
>> Revno 4668 takes review comments into account:
>> - settle on using --take-this/--take-other instead of --keep-mine/--take-theirs,
>> - stop using rest in conflict-types.txt since it's displayed by
>> ``bzr help conflict-types`` without processing.
jam> I would probably have left in the ReST syntax, since it is how other
jam> bits are formatted, and leave to a separate action creating a plain-text
jam> formatter for the rest documentation. (help strings, etc are all already
jam> ReST or meant to be ReST, so we need to handle it anyway.)
And spit rest bits to the user when doing `bzr help conflict-types` ???
>>>>> "jam" == John A Meinel <email address hidden> writes:
jam> Vincent Ladeuil wrote: this/-- take-other instead of --keep- mine/-- take-theirs,
>> Revno 4668 takes review comments into account:
>> - settle on using --take-
>> - stop using rest in conflict-types.txt since it's displayed by
>> ``bzr help conflict-types`` without processing.
jam> I would probably have left in the ReST syntax, since it is how other
jam> bits are formatted, and leave to a separate action creating a plain-text
jam> formatter for the rest documentation. (help strings, etc are all already
jam> ReST or meant to be ReST, so we need to handle it anyway.)
And spit rest bits to the user when doing `bzr help conflict-types` ???