diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-16 08:24:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-16 08:24:20 -0700 |
| commit | 0987145dd3d11373270c1e0cfbd449f2c6c834c9 (patch) | |
| tree | d088652b6cce0bc844da014edf615a26847ecad3 /builtin/diff.c | |
| parent | Merge branch 'jc/maint-verify-objects-remove-pessimism' (diff) | |
| parent | Documentation/difftool: add deltawalker to list of valid diff tools (diff) | |
| download | git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.tar.gz git-0987145dd3d11373270c1e0cfbd449f2c6c834c9.zip | |
Merge branch 'th/mergetools-deltawalker'
* th/mergetools-deltawalker:
Documentation/difftool: add deltawalker to list of valid diff tools
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions