tree 7fc97231cfbef133726da4c20586ec4a64962ba6
parent 245648dede5e67180ce059a71e3f77a8bb7f52b4
parent 9196e825875dce66f6bc95dda01f5833f20bc5e5
author Junio C Hamano <gitster@pobox.com> 1216602017 -0700
committer Junio C Hamano <gitster@pobox.com> 1216602017 -0700

Merge branch 'jc/rerere-auto-more'

* jc/rerere-auto-more:
  rerere.autoupdate: change the message when autoupdate is in effect