![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 26 Sep 2008 15:31:56 +0000 (08:31 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 26 Sep 2008 15:31:56 +0000 (08:31 -0700) | ||
| commit | 15dc66abf02fa22a03d709725bcaeeec4b809834 | |
| tree | ec812826aea20a20624ad6de5933941582634652 | tree | snapshot |
| parent | eb53586ba94087d9750c58d29ff494e5c1a95207 | commit | diff |
| parent | 41f13af558db1018250ade4d99a51f0b76f65bc8 | commit | diff |
Merge branch 'maint'
* maint:
Remove empty directories in recursive merge
Documentation: clarify the details of overriding LESS via core.pager
Conflicts:
builtin-merge-recursive.c
* maint:
Remove empty directories in recursive merge
Documentation: clarify the details of overriding LESS via core.pager
Conflicts:
builtin-merge-recursive.c
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | | | blob | history |