Rev 1464: Change cmd_revert to use merge_inner. in /home/robertc/source/baz/bzr-workingtree

------------------------------------------------------------
revno: 1464
revision-id: robertc at robertcollins.net-20051104165442-a49126bfb45faea7
parent: robertc at robertcollins.net-20051104165404-61dfbc093c768448
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-04 11:54:42 -0500
message:
  Change cmd_revert to use merge_inner.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106