Mercurial > hg

comparison tests/test-bookmarks-merge.t @ 33829:b86fc43e4b73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: write merge result to the localctx, if passed Differential Revision: https://phab.mercurial-scm.org/D375
author Phil Cohen <phillco@fb.com>
date Sun, 13 Aug 2017 22:46:03 -0700
parents 10f15e34d86c
children 8197b395710e
comparison
equal deleted inserted replaced
33828:8b91a4ff23ad 33829:b86fc43e4b73