diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:35:53 -0700 |
| commit | c4800a3b7731a4dc0274736403e8202ce3346f04 (patch) | |
| tree | e864296135830ce3895c20fc770cfa6810aff2c6 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'nm/grep-object-sha1-lock' (diff) | |
| parent | Symlink mergetools scriptlets into valgrind wrappers (diff) | |
| download | tgif-c4800a3b7731a4dc0274736403e8202ce3346f04.tar.xz | |
Merge branch 'tr/mergetool-valgrind'
* tr/mergetool-valgrind:
Symlink mergetools scriptlets into valgrind wrappers
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions