Ignore:
Timestamp:
2009-06-07T15:04:28+02:00 (12 years ago)
Author:
Gubaer
Message:

added concept of "merge pairs" (my vs. merged, my vs. their, their vs. merged)
added highlighting of conflicts with colors
now displays number of entries for lists
fixed bugs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/.settings/org.eclipse.jdt.core.prefs

    r981 r1650  
    1 #Sun Sep 07 19:15:59 CEST 2008
     1#Sat Jun 06 11:00:10 CEST 2009
    22eclipse.preferences.version=1
    33org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
     
    101101org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
    102102org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
    103 org.eclipse.jdt.core.formatter.comment.format_block_comments=false
     103org.eclipse.jdt.core.formatter.comment.format_block_comments=true
    104104org.eclipse.jdt.core.formatter.comment.format_comments=true
    105105org.eclipse.jdt.core.formatter.comment.format_header=false
    106106org.eclipse.jdt.core.formatter.comment.format_html=false
    107 org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
    108 org.eclipse.jdt.core.formatter.comment.format_line_comments=false
     107org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
     108org.eclipse.jdt.core.formatter.comment.format_line_comments=true
    109109org.eclipse.jdt.core.formatter.comment.format_source_code=false
    110110org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
Note: See TracChangeset for help on using the changeset viewer.