![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 23 May 2007 07:16:11 +0000 (00:16 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 23 May 2007 07:16:11 +0000 (00:16 -0700) | ||
| commit | e97593693ed36da918413732c9ca4b09c3e9d213 | |
| tree | 9c06adffc5bf959829e20024fdadc4c9f8d9e230 | tree | snapshot |
| parent | a3342a2f52a5351739577f8773eab2a1db20b651 | commit | diff |
| parent | c80e07d4959591f5addcd48c7d42017b40c25f36 | commit | diff |
Merge branch 'maint'
* maint:
Document branch.autosetupmerge.
* maint:
Document branch.autosetupmerge.
| Documentation/config.txt | diff1 | | diff2 | | blob | history |