Mercurial > hg
diff tests/test-largefiles-update.t @ 27163:27b89a0957ec
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 |
line wrap: on
line diff
--- a/tests/test-largefiles-update.t Mon Nov 30 11:17:18 2015 -0800 +++ b/tests/test-largefiles-update.t Mon Nov 30 13:43:55 2015 -0800 @@ -596,7 +596,7 @@ rebasing 1:72518492caa6 "#1" rebasing 4:07d6153b5c04 "#4" local changed .hglf/large1 which remote deleted - use (c)hanged version or (d)elete? c + use (c)hanged version, (d)elete, or leave (u)nresolved? c $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' -e5bb990443d6a92aaf7223813720f7566c9dd05b