Retire 'stupid' merge strategy
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 5 Jul 2008 14:43:51 +0000 (16:43 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Jul 2008 17:43:46 +0000 (10:43 -0700)
commit51add76...92c9de9bcad3d421303b45ab488d529e
tree96d2774...e499bf213ea1f1d6e33ffcf1ce4cac1ecopy hash to clipboard (tree)
parent6cf9149...d9cd985e1fa65181d99d6d578d4439dccopy hash to clipboard (diff)
.gitignore
Makefile
git-merge-stupid.sh [deleted file]