Mercurial > hg
log tests/test-merge-tools.t @ 36999:e349ad5cbb71
| age | author | description |
|---|---|---|
| Fri, 19 Jan 2018 19:07:58 -0800 | Kyle Lippincott | filemerge: use a single temp dir instead of temp files |
| Sun, 04 Mar 2018 16:23:03 -0500 | Augie Fackler | tests: stop over-specifying tempfile name |
| Sun, 11 Feb 2018 20:59:35 -0500 | Matt Harbison | test-merge-tools: stabilize for Windows |
| Fri, 09 Feb 2018 13:18:17 +0100 | Boris Feld | test: glob the temporary directory out of temporary file path |
| Wed, 17 Jan 2018 17:35:05 -0800 | Kyle Lippincott | filemerge: support passing labels to external merge tools |
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Sat, 13 May 2017 03:37:50 +0900 | FUJIWARA Katsunori | debugcommands: add debugpickmergetool to examine which merge tool is chosen |