diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-11 23:14:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 23:14:53 -0800 |
| commit | 463e8c766c99c7afe7c4bbd6960d0ef247b60f5b (patch) | |
| tree | 27b9d3edd5ee02e4dfb40460f1892e099cf201a3 /builtin-merge-ours.c | |
| parent | ecb879f8772d5970bf1eb3677f9c9ebdd6e116a1 (diff) | |
| download | git-463e8c766c99c7afe7c4bbd6960d0ef247b60f5b.tar.gz | |
.mailmap: adjust to a recent patch application glitch.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions