![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:46:22 +0000 (01:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 Jul 2007 08:46:22 +0000 (01:46 -0700) | ||
| commit | 1fd81efad0d65afba91f8fb27b40a6345bfb50de | |
| tree | b061c0e043619ba3469f23b7c73cbbc43cb62dc1 | tree | snapshot |
| parent | 7425dcc95e11c20dc4663d7a376dc9ba0424d843 | commit | diff |
| parent | 733a65aa5d33196fac708ebd12a98a1060cbf3c2 | commit | diff |
Merge branch 'ew/svn'
* ew/svn:
git-svn: allow dcommit to retain local merge information
* ew/svn:
git-svn: allow dcommit to retain local merge information
| git-svn.perl | diff1 | | diff2 | | blob | history |