diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-08 08:54:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-08 08:54:01 -0700 |
| commit | 9f44723d1a2c6a97306a7160deeab621e08bea7a (patch) | |
| tree | 0ad4ae4a8de137be14011c8b7f3b8c01875ce997 /git.c | |
| parent | 7505ae272bad53c6451f34ff5f04ad24f29b6dd9 (diff) | |
| parent | 4ce6fb805803cd9bf82c08c84a2fdc8cd6bae8ef (diff) | |
| download | git-9f44723d1a2c6a97306a7160deeab621e08bea7a.tar.gz git-9f44723d1a2c6a97306a7160deeab621e08bea7a.tar.xz | |
Merge branch 'en/d-f-conflict-fix'
* en/d-f-conflict-fix:
fast-export: ensure that a renamed file is printed after all references
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions