diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2013-09-26 12:34:23 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-09-26 12:34:23 -0700 |
| commit | 76deaab4e89af726eabacfd58c6678804bc901c1 (patch) | |
| tree | 0b827524365ce2ce8844f27150f0a5c80118e4fb /merge.c | |
| parent | Merge branch 'js/xread-in-full' into maint (diff) | |
| parent | Git.pm: revert _temp_cache use of temp_is_locked (diff) | |
| download | tgif-76deaab4e89af726eabacfd58c6678804bc901c1.tar.xz | |
Merge branch 'km/svn-1.8-serf-only' into maint
* km/svn-1.8-serf-only:
Git.pm: revert _temp_cache use of temp_is_locked
git-svn: allow git-svn fetching to work using serf
Git.pm: add new temp_is_locked function
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions