revert: add "--strategy" option to choose merge strategy
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 31 Mar 2010 19:22:08 +0000 (21:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 18:14:11 +0000 (11:14 -0700)
commit91e5259...9665d69ace11b8f39618b1e8004fe19a
tree11e5ea3...c5fb54006f8ac74d6d739be52eb4c47ecopy hash to clipboard (tree)
parentc674d05...7396e4100454e8992ed7381ee29dd54ecopy hash to clipboard (diff)
builtin/revert.c