-sh-4.1$ hg pull -u
pulling from http://hg.nocproject.org/noc
searching for changes
adding changesets
adding manifests
adding file changes
added 12 changesets with 19 changes to 12 files
merging sa/profiles/Cisco/IOS/get_vlans.py
merge: warning: conflicts during merge
merging sa/profiles/Cisco/IOS/get_vlans.py failed!
11 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
-sh-4.1$ hg resolve
abort: no files or directories specified; use --all to remerge all files
-sh-4.1$ hg resolve --all
merging sa/profiles/Cisco/IOS/get_vlans.py
merge: warning: conflicts during merge
merging sa/profiles/Cisco/IOS/get_vlans.py failed!
-sh-4.1$ hg pull -u
pulling from http://hg.nocproject.org/noc
searching for changes
no changes found