#commname: Your Name
#commemail: your.name@yourcompany.com
+# E-mail sender (added to the "From: " header)
+#sender: Your Name <your.name@yourcompany.com>
+
+# Automatically Bcc the address below
+#autobcc: your.name@yourcompany.com
+
# Set to 'yes' if you don't want to use the 'resolved' command.
# 'refresh' will automatically mark the conflicts as resolved
#autoresolved: no
# Leave the original files in the working tree in case of a merge conflict
#keeporig: yes
+# Optimize (repack) the object store after every pull
+#keepoptimized: yes
+
# Extensions for the files involved in a three-way merge (ancestor,
# current, patched)
#extensions: .ancestor .current .patched