asedeno.scripts.mit.edu Git - git.git/history

]> asedeno.scripts.mit.edu Git - git.git/history - t/t7607-merge-overwrite.sh

2009-01-13	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw
2008-12-15	Junio C Hamano	merge-recursive: do not clobber untracked working tree...	blob \| commitdiff \| raw
2008-12-15	Clemens Buchacher	modify/delete conflict resolution overwrites untracked file	blob \| commitdiff \| raw \| diff to current

local clone of git.git