Skip to content
Snippets Groups Projects
Select Git revision
  • 426b022776672fdf3d71ddd98d89af341c88080f
  • main default protected
  • 3.10
  • 3.11
  • revert-15688-bpo-38031-_io-FileIO-opener-crash
  • 3.8
  • 3.9
  • 3.7
  • enum-fix_auto
  • branch-v3.11.0
  • backport-c3648f4-3.11
  • gh-93963/remove-importlib-resources-abcs
  • refactor-wait_for
  • shared-testcase
  • v3.12.0a2
  • v3.12.0a1
  • v3.11.0
  • v3.8.15
  • v3.9.15
  • v3.10.8
  • v3.7.15
  • v3.11.0rc2
  • v3.8.14
  • v3.9.14
  • v3.7.14
  • v3.10.7
  • v3.11.0rc1
  • v3.10.6
  • v3.11.0b5
  • v3.11.0b4
  • v3.10.5
  • v3.11.0b3
  • v3.11.0b2
  • v3.9.13
34 results

README

Blame
  • .gitattributes 2.46 KiB
    ###############################################################################
    # Set default behavior to automatically normalize line endings.
    ###############################################################################
    * text=auto
    
    ###############################################################################
    # Set default behavior for command prompt diff.
    #
    # This is need for earlier builds of msysgit that does not have it on by
    # default for csharp files.
    # Note: This is only used by command line
    ###############################################################################
    #*.cs     diff=csharp
    
    ###############################################################################
    # Set the merge driver for project and solution files
    #
    # Merging from the command prompt will add diff markers to the files if there
    # are conflicts (Merging from VS is not affected by the settings below, in VS
    # the diff markers are never inserted). Diff markers may cause the following 
    # file extensions to fail to load in VS. An alternative would be to treat
    # these files as binary and thus will always conflict and require user
    # intervention with every merge. To do so, just uncomment the entries below
    ###############################################################################
    #*.sln       merge=binary
    #*.csproj    merge=binary
    #*.vbproj    merge=binary
    #*.vcxproj   merge=binary
    #*.vcproj    merge=binary
    #*.dbproj    merge=binary
    #*.fsproj    merge=binary
    #*.lsproj    merge=binary
    #*.wixproj   merge=binary
    #*.modelproj merge=binary
    #*.sqlproj   merge=binary
    #*.wwaproj   merge=binary
    
    ###############################################################################
    # behavior for image files
    #
    # image files are treated as binary by default.
    ###############################################################################
    #*.jpg   binary
    #*.png   binary
    #*.gif   binary
    
    ###############################################################################
    # diff behavior for common document formats
    # 
    # Convert binary document formats to text before diffing them. This feature
    # is only available from the command line. Turn it on by uncommenting the 
    # entries below.
    ###############################################################################
    #*.doc   diff=astextplain
    #*.DOC   diff=astextplain
    #*.docx  diff=astextplain
    #*.DOCX  diff=astextplain
    #*.dot   diff=astextplain
    #*.DOT   diff=astextplain
    #*.pdf   diff=astextplain
    #*.PDF   diff=astextplain
    #*.rtf   diff=astextplain
    #*.RTF   diff=astextplain