diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:23 -0700 |
| commit | 59b2389c324dbbb335bd3375d950433b600eee90 (patch) | |
| tree | 3bebaa5ac1c31664d0a3f140c8c4d5a863b6cb59 /pretty.c | |
| parent | 7ab576ce2dc8bb7e87c8fa2c945e61345308d03d (diff) | |
| parent | ff7f089ed1064b6a10e958bf405f828226262424 (diff) | |
| download | git-59b2389c324dbbb335bd3375d950433b600eee90.tar.gz git-59b2389c324dbbb335bd3375d950433b600eee90.tar.xz | |
Merge branch 'jm/mergetool-submodules'
* jm/mergetool-submodules:
mergetool: Teach about submodules
Diffstat (limited to 'pretty.c')
0 files changed, 0 insertions, 0 deletions