Merge git://repo.or.cz/darcs2git
authorHan-Wen Nienhuys <hanwen@lilypond.org>
Fri, 25 May 2007 02:33:26 +0000 (24 23:33 -0300)
committerHan-Wen Nienhuys <hanwen@lilypond.org>
Fri, 25 May 2007 02:33:26 +0000 (24 23:33 -0300)
Conflicts:

darcs2git.py

1  2 
darcs2git.py

diff --cc darcs2git.py
  #
  # - file modes
  #
 -# - use binary search to find from-patch ica. conflict.
 +# - use binary search to find from-patch in case of conflict.
  #
  
+ import urlparse
+ import distutils.version
  import glob
  import os  
  import sys