git.tokkee.org Git - git.git/history - t/t7607-merge-overwrite.sh

2009-01-07	Junio C Hamano	Merge branch 'cb/merge-recursive-fix'	blob \| commitdiff \| raw
2008-12-15	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into cb...	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...	blob \| commitdiff \| raw \| diff to current

Git - the stupid content tracker

tokkee.org