Probably something elementary but I'm too thick to work out what. I've pulled some changes and attempted to merge them but it refuses:
[t...@sparcv490 - src] hg pull -u pulling from http://localhost:9000 searching for changes adding changesets adding manifests adding file changes added 100 changesets with 734 changes to 690 files (+1 heads) not updating, since new heads added (run 'hg heads' to see heads, 'hg merge' to merge) [t...@sparcv490 - src] hg merge abort: outstanding uncommitted changes [t...@sparcv490 - src] hg commit nothing changed [t...@sparcv490 - src] hg merge abort: outstanding uncommitted changes Can someone tell me what I'm stuffing up? Neale -- This message posted from opensolaris.org _______________________________________________ opensolaris-help mailing list [email protected]
