Tom Clarke
7d3c82a761
Fixing comment in merge strategies
...
Comments in both these strategies refer to the wrong number
of remotes
Signed-off-by: Tom Clarke <tom@u2i.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-30 17:18:22 -07:00
Junio C Hamano
5be60078c9
Rewrite "git-frotz" to "git frotz"
...
This uses the remove-dashes target to replace "git-frotz" to "git frotz".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-02 22:52:14 -07:00
Junio C Hamano
2276aa6c09
Use Daniel's read-tree in the merge strategy 'resolve'.
...
And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10 18:30:41 -07:00
