diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 12:21:39 -0800 |
| commit | d98c916e8f02c01764831c12553f21de12624892 (patch) | |
| tree | 5e5953867a1f038da8bd525c55b1f2d888e0841f /resolve-undo.c | |
| parent | 1aeb10a14d5ecf5a10a4536b873c9feb244a7848 (diff) | |
| parent | ac930287ff16823531b541a8e6a7436279e612be (diff) | |
| download | git-d98c916e8f02c01764831c12553f21de12624892.tar.gz git-d98c916e8f02c01764831c12553f21de12624892.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: workaround for a bug in svn serf backend
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions