Remove the resolved command

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index e235e14170bdc923f882ca85194dfafe1c7aeaa7..4f56918f0f54b1b0eea6e4f77d054bb34da96fb3 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -17,10 +17,6 @@
        # Automatically sign newly created patches
        #autosign = Signed-off-by
 
        # Automatically sign newly created patches
        #autosign = Signed-off-by
 

-       # Set to 'yes' if you don't want to use the 'resolved' command.
-       # 'refresh' will automatically mark the conflicts as resolved
-       #autoresolved = no
-

        # SMTP server for sending patches
        #smtpserver = /usr/sbin/sendmail -t -i
        #smtpserver = localhost:25
        # SMTP server for sending patches
        #smtpserver = /usr/sbin/sendmail -t -i
        #smtpserver = localhost:25