aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'PassCrackerClient/.gitattributes')
-rwxr-xr-xPassCrackerClient/.gitattributes63
1 files changed, 63 insertions, 0 deletions
diff --git a/PassCrackerClient/.gitattributes b/PassCrackerClient/.gitattributes
new file mode 100755
index 0000000..1ff0c42
--- /dev/null
+++ b/PassCrackerClient/.gitattributes
@@ -0,0 +1,63 @@
+###############################################################################
+# 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