Mercurial > hg

comparison tests/test-largefiles-update.t @ 27163:27b89a0957ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 30 Nov 2015 13:43:55 -0800
parents 832c98d79587
children 157675d0f600
comparison
equal deleted inserted replaced
27162:4ab69be0ea15 27163:27b89a0957ec
594 > c 594 > c
595 > EOF 595 > EOF
596 rebasing 1:72518492caa6 "#1" 596 rebasing 1:72518492caa6 "#1"
597 rebasing 4:07d6153b5c04 "#4" 597 rebasing 4:07d6153b5c04 "#4"
598 local changed .hglf/large1 which remote deleted 598 local changed .hglf/large1 which remote deleted
599 use (c)hanged version or (d)elete? c 599 use (c)hanged version, (d)elete, or leave (u)nresolved? c
600 600
601 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' 601 $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
602 -e5bb990443d6a92aaf7223813720f7566c9dd05b 602 -e5bb990443d6a92aaf7223813720f7566c9dd05b
603 +8a4f783556e7dea21139ca0466eafce954c75c13 603 +8a4f783556e7dea21139ca0466eafce954c75c13
604 $ rm -f large1 604 $ rm -f large1