diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-21 14:56:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-21 14:56:59 -0700 |
| commit | 2765233c64c35eb43a8b46c377fb8b464469221f (patch) | |
| tree | a35acf3102d96c2518a9107198e54bd542258f84 /Documentation/git-mergetool.txt | |
| parent | 13b70d2ad96a79fb439c6b4fc0e8058b1762bae2 (diff) | |
| parent | a598ded1e2e9cc9f4ce93d091808b475839e6867 (diff) | |
| download | git-2765233c64c35eb43a8b46c377fb8b464469221f.tar.gz git-2765233c64c35eb43a8b46c377fb8b464469221f.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions