diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:57 -0700 |
| commit | eb5398a89122e4345b1fd3cab4f5630290bb3d0e (patch) | |
| tree | cb9932fff1eb1f41494568d8579e5bc146aa4379 /mergetools/kompare | |
| parent | Merge branch 'jn/test-lint-unmoor' (diff) | |
| parent | git-p4: Do not include diff in spec file when just preparing p4 (diff) | |
| download | tgif-eb5398a89122e4345b1fd3cab4f5630290bb3d0e.tar.xz | |
Merge branch 'mc/git-p4-prepare-p4-only'
* mc/git-p4-prepare-p4-only:
git-p4: Do not include diff in spec file when just preparing p4
Diffstat (limited to 'mergetools/kompare')
0 files changed, 0 insertions, 0 deletions