Mercurial > hg
log tests/test-merge-internal-tools-pattern.t @ 36986:afac8ab37c2c
| age | author | description |
|---|---|---|
| Mon, 08 Jan 2018 19:41:47 +0530 | Pulkit Goyal | merge: add `--abort` flag which can abort the merge |
| Sun, 16 Aug 2015 10:19:00 +0200 | Erik Huelsmann | filemerge: add 'union' merge to internal merge tool |
| Fri, 17 Sep 2010 17:03:08 -0500 | Matt Mackall | tests: fix a bunch of pointless #s in unified tests |
| Thu, 16 Sep 2010 17:51:32 -0500 | Matt Mackall | tests: add exit codes to unified tests |
| Sun, 12 Sep 2010 18:05:53 -0500 | Brodie Rao | merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' |
| Sat, 11 Sep 2010 20:04:35 +0200 | Adrian Buehlmann | tests: unify test-merge-internal-tools-pattern base tests/test-merge-internal-tools-pattern@633bbfcee94b |