Comment # 13
on bug 10911
from Yaniv Kaul
error: could not revert aaa3d23... When issued with -v wireshark-qt prints
version and exits.
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
yanivk@vd-yanivk7:~/wireshark (master)> git status
# On branch master
# You are currently reverting commit aaa3d23.
# (fix conflicts and run "git revert --continue")
# (use "git revert --abort" to cancel the revert operation)
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add <file>..." to mark resolution)
#
# both modified: wireshark-qt.cpp
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# aclocal-fallback/pkg.m4
# ui/qt/main.cpp
# version_info.c
# version_info.h
# wsutil/compiler_info.c
# wsutil/compiler_info.h
# wsutil/cpu_info.c
# wsutil/cpu_info.h
# wsutil/glib_version_info.c
# wsutil/glib_version_info.h
# wsutil/mem_info.c
# wsutil/mem_info.h
You are receiving this mail because:
- You are watching all bug changes.
