merge!
allow merges of unrelated parents (no common ancestor)
indentation fixes
rename detection (exact)
rename_conficts tests
added minor table for rename conflicts
cleanups from checkout stability
add test for crlf conversion for automerge
incremement usage on our fake tree
slightly better index handling
branhces part 1
filediff now merge_file
minor refactor
move to git_diff_file
more refactor
mo refactor
test fix
reeeefactor
oops extern
NOW with index goodness