[SVN-647] select 2- or 3-way conflict markers as user prefs

• Type: Improvement
• Status: Closed
• Priority: Trivial
• Resolution: Duplicate
• Affects Version/s: all
• Fix Version/s: nonblocking
• Component/s: unknown

Environment

other

• Assignee: Unassigned
• Reporter: Ben Collins-Sussman
• Created: 12/Mar/02 19:43
• Updated: 27/Oct/18 16:42
• Resolved: 15/Sep/04 08:43

Description

See issue 579:  Karl is creating the ~/.subversion/ area to allow
user-customized proxy configuration.  But other preferences should go in there
too.  For example, the user should decide whether s/he wants "-A" or "-E" passed
to diff3, to get 2 or 3 part conflict markers.

Issue Links

• duplicates: SVN-682 evaluate 'diff3 -E' vs. 'diff3 -A'