Merge branch 'mg/replace-resolve-delete'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (20 10:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Nov 2012 18:38:32 +0000 (20 10:38 -0800)
Be more user friendly to people using "git replace -d".

* mg/replace-resolve-delete:
  replace: parse revision argument for -d


Trivial merge