Mercurial > hg

comparison tests/test-update-branches.t @ 48590:7e503eff3c76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 Jan 2022 13:23:49 -0800
parents 74973a6d4e67
children fbf7e383e961
comparison
equal deleted inserted replaced
48589:a51c522c0064 48590:7e503eff3c76
290 # a 290 # a
291 # 291 #
292 # To mark files as resolved: hg resolve --mark FILE 292 # To mark files as resolved: hg resolve --mark FILE
293 293
294 $ cat a 294 $ cat a
295 <<<<<<< working copy: 6efa171f091b - test: 3 295 <<<<<<< working copy: 6efa171f091b - test: 3
296 three 296 three
297 dirty 297 dirty
298 ||||||| base: 6efa171f091b - test: 3 298 ||||||| working copy parent: 6efa171f091b - test: 3
299 three 299 three
300 ======= 300 =======
301 four 301 four
302 >>>>>>> destination: d047485b3896 b1 - test: 4 302 >>>>>>> destination: d047485b3896 b1 - test: 4
303 $ rm a.orig 303 $ rm a.orig
304 304
305 $ echo 'update.check = noconflict' >> .hg/hgrc 305 $ echo 'update.check = noconflict' >> .hg/hgrc
306 306
307 $ revtest 'none dirty cross' dirty 3 4 307 $ revtest 'none dirty cross' dirty 3 4