merge doesn't work when init
authorCarl Fürstenberg <azatoth@gmail.com>
Thu, 17 Mar 2011 19:40:07 +0000 (20:40 +0100)
committerCarl Fürstenberg <azatoth@gmail.com>
Fri, 18 Mar 2011 16:59:16 +0000 (17:59 +0100)
commit8a1156da9b835d826bfb4b82c41bcdd0d87aff05
tree1c39d123272e07f7031df465385ab6e6d884dd2e
parente2dd8916eef1daba1a56a5ff1fbb44cb3385f4f0
merge doesn't work when init

sadly the merge strategy doesn't work when doing an initial clone,
circumvent that
Makefile