Mercurial > hg
comparison tests/test-rebase-collapse.t @ 21875:33020e87f8c5
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 | 18adc15635a1 |
| children | 6122ad50e38f |
comparison
equal
deleted
inserted
replaced
| 21874:8da01b6e7b49 | 21875:33020e87f8c5 |
|---|