[Monotone-commits-diffs] Revision 55bd9681bc3dd66910847109b449c3fd36b1a1a5

[monotone]

-----------------------------------------------------------------
Revision: 55bd9681bc3dd66910847109b449c3fd36b1a1a5
Ancestor: 5bb9142d2928524904e0e9e004dccbe80b1302a3
Author: address@hidden
Date: 2006-07-12T01:30:07
Branch: net.venge.monotone.multihead

Modified files:
        ChangeLog cmd_merging.cc

ChangeLog: 

        * cmd_merging.cc (merge_two): New function.
        (CMD(merge)): Rewrite again - only merge one pair of heads on each
        pass.  Also, skip all the work of finding a good choice if there
        are only two heads. Use merge_two.
        (CMD(explicit_merge)): Use merge_two.

txtkN5s1zeElJ.txt
Description: Diff [5bb9142d2928524904e0e9e004dccbe80b1302a3] -> [55bd9681bc3dd66910847109b449c3fd36b1a1a5]