diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-05-14 12:06:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-19 17:09:57 -0700 |
| commit | 10e1feebb454d99eb6644cc53b94255f40e6fe9c (patch) | |
| tree | cdd92ca11b48b6b50865f62251c40d82bf1f246e /builtin/merge-file.c | |
| parent | Git 2.0-rc3 (diff) | |
| download | tgif-10e1feebb454d99eb6644cc53b94255f40e6fe9c.tar.xz | |
Revert "Merge branch 'fc/transport-helper-sync-error-fix'"
This reverts commit d508e4a8e2391ae2596403b6478d01cf3d5f928f,
reversing changes made to e42552135a2a396f37053a89f44952ea907870b2.
The author of the original topic says he broke the upcoming 2.0
release with something that relates to "synchronization crash
regression" while refusing to give further specifics, so this would
unfortunately be the safest option for the upcoming release.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions