Mercurial > hg

diff tests/test-merge-force.t @ 21875:33020e87f8c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: add --nofork option to gvimdiff.diffargs for extdiff Without --nofork, temporary files are removed immediately before gvimdiff starts. "-d -g -O" are put just for consistency with gvimdiff.args.
author Yuya Nishihara <yuya@tcha.org>
date Sat, 12 Jul 2014 20:07:24 +0900
parents 94c394653b2a
children eeecf29cc397
line wrap: on
line diff