Mercurial > hg
comparison tests/test-update-branches.t @ 44344:ab632e27f296
tests: add `hg log -G` output when there are merge conflicts
The next commit will change the behavior for these. I've used slightly
different commands in the different tests to match the surrounding
style.
Differential Revision: https://phab.mercurial-scm.org/D8042
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 29 Jan 2020 14:42:54 -0800 |
parents | 07ebb567e8bb |
children | 14d0e89520a2 |
comparison
equal
deleted
inserted
replaced
44343:8561ad49915d | 44344:ab632e27f296 |
---|---|
247 merging a | 247 merging a |
248 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 248 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
249 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 249 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
250 use 'hg resolve' to retry unresolved file merges | 250 use 'hg resolve' to retry unresolved file merges |
251 [1] | 251 [1] |
252 $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n' | |
253 o 5:ff252e8273df b1 | |
254 | | |
255 @ 4:d047485b3896 0:60829823a42a b1 | |
256 | | |
257 | o 3:6efa171f091b 1:0786582aa4b1 | |
258 | | | |
259 | | o 2:bd10386d478c | |
260 | |/ | |
261 | o 1:0786582aa4b1 | |
262 |/ | |
263 o 0:60829823a42a | |
264 | |
252 $ hg st | 265 $ hg st |
253 M a | 266 M a |
254 ? a.orig | 267 ? a.orig |
255 # Unresolved merge conflicts: | 268 # Unresolved merge conflicts: |
256 # | 269 # |