diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-26 08:31:56 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-26 08:31:56 -0700 |
| commit | 15dc66abf02fa22a03d709725bcaeeec4b809834 (patch) | |
| tree | ec812826aea20a20624ad6de5933941582634652 /xdiff | |
| parent | eb53586ba94087d9750c58d29ff494e5c1a95207 (diff) | |
| parent | 41f13af558db1018250ade4d99a51f0b76f65bc8 (diff) | |
| download | git-15dc66abf02fa22a03d709725bcaeeec4b809834.tar.gz git-15dc66abf02fa22a03d709725bcaeeec4b809834.tar.xz | |
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
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions