tree 3f07f1dc61c73a1d78dafc8272ec44ed6a785688
parent 9cf5673475871707dbeb986d29531e94ed655849
author Vincent Driessen <vincent@datafox.nl> 1265108317 +0100
committer Vincent Driessen <vincent@datafox.nl> 1265108317 +0100

Add support for the -r (--rebase) option, before doing the actual merge.