diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:49:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 10:50:00 -0700 |
| commit | 5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e (patch) | |
| tree | 68ef8d3d081fcd82fbb770b9f7fb0a7811cb8527 /merge-recursive.c | |
| parent | Merge branch 'nm/maint-conflicted-submodule-entries' into maint (diff) | |
| download | tgif-5fb41b883a5d0f9cbc4c6c693e6d84a8a5cee17e.tar.xz | |
Git 1.7.4.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions