diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:31:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-10 21:32:10 -0800 |
| commit | 954cfb5cfd17d57b9b31b19b73efe73199407e07 (patch) | |
| tree | f3baaaf7f25372b96e206b2bc3c8dd3940919433 /merge-file.c | |
| parent | f1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (diff) | |
| download | git-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.gz git-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.xz | |
Revert "Merge branch 'js/notes'"
This reverts commit 7b75b331f6744fbf953fe8913703378ef86a2189, reversing
changes made to 5d680a67d7909c89af96eba4a2d77abed606292b.
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions