diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-03 23:58:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-03 23:58:26 -0700 |
| commit | 731651fe25a7d7a242584e4b85112a610c32a23f (patch) | |
| tree | 4f075c7c075b5f14f752484993ece4d077e29df5 /csum-file.c | |
| parent | read-tree --reset: update working tree file for conflicted paths. (diff) | |
| parent | git-svnimport: Improved detection of merges. (diff) | |
| download | tgif-731651fe25a7d7a242584e4b85112a610c32a23f.tar.xz | |
Merge branch 'ff/svnimport'
* ff/svnimport:
git-svnimport: Improved detection of merges.
Diffstat (limited to 'csum-file.c')
0 files changed, 0 insertions, 0 deletions