diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-20 10:44:07 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-20 10:44:07 +0300 |
commit | 8c5b85ce87d15e4db37a6408f03b0eb71dde080e (patch) | |
tree | 71b226a7452da6d52d07a60c9957424cd64d0a19 /t/t7610-mergetool.sh | |
parent | 7d233dea5f4e299fdac8d6cfb610bcd4d60a82b7 (diff) | |
parent | e43a6fd3e94888d76779ad79fb568ed180e5fcdf (diff) |
Merge branch 'maint'
* maint:
More friendly message when locking the index fails.
Document git blame --reverse.
Documentation: Note file formats send-email accepts
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions