diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:53 -0700 |
| commit | 408dee5222fd732ac8d59d4d95ee47f5662150d2 (patch) | |
| tree | 9ebe7c427b42940b7c770cfe0d782692ace523da /resolve-undo.c | |
| parent | Merge branch 'jc/conflict-marker-size' into maint (diff) | |
| parent | rev-list: fix --pretty=oneline with empty message (diff) | |
| download | tgif-408dee5222fd732ac8d59d4d95ee47f5662150d2.tar.xz | |
Merge branch 'ef/maint-empty-commit-log' into maint
* ef/maint-empty-commit-log:
rev-list: fix --pretty=oneline with empty message
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions