![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Sep 2010 15:54:01 +0000 (08:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 8 Sep 2010 15:54:01 +0000 (08:54 -0700) | ||
| commit | 9f44723d1a2c6a97306a7160deeab621e08bea7a | |
| tree | 0ad4ae4a8de137be14011c8b7f3b8c01875ce997 | tree | snapshot |
| parent | 7505ae272bad53c6451f34ff5f04ad24f29b6dd9 | commit | diff |
| parent | 4ce6fb805803cd9bf82c08c84a2fdc8cd6bae8ef | commit | diff |
Merge branch 'en/d-f-conflict-fix'
* en/d-f-conflict-fix:
fast-export: ensure that a renamed file is printed after all references
* en/d-f-conflict-fix:
fast-export: ensure that a renamed file is printed after all references
| builtin/fast-export.c | diff1 | | diff2 | | blob | history |