Viewing all changes in revision 2149.2.1.
- Committer: Jan Hudec
- Date: 2006-11-25 20:38:39 UTC
- mto: (2199.1.1 jam-integration)
- mto: This revision was merged to the branch mainline in revision 2200.
- Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.
Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.
Simple test for this option is included.
Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.
Simple test for this option is included.
- files modified:
- NEWS
expand all
collapse all
added
removed
