Tue, 18 Jan 2022 15:04:55 -0800 | Martin von Zweigbergk | merge: set custom conflict label for base commit | file | diff | annotate |
Thu, 20 Jan 2022 14:13:12 -0800 | Martin von Zweigbergk | filemerge: always define a "base" label | file | diff | annotate |
Thu, 02 Dec 2021 22:59:36 -0800 | Martin von Zweigbergk | mergestate: merge `preresolve()` into `resolve()` | file | diff | annotate |
Thu, 20 Jun 2019 11:40:47 -0700 | Kyle Lippincott | filemerge: make last line of prompts <40 english chars (issue6158) | file | diff | annotate |
Tue, 18 Sep 2018 23:47:21 -0400 | Matt Harbison | tests: quote PYTHON usage | file | diff | annotate |
Sun, 26 Aug 2018 19:14:26 +0300 | Pulkit Goyal | filemerge: fix the wrong placements of messages in prompt | file | diff | annotate |
Sat, 25 Aug 2018 21:17:34 +0300 | Pulkit Goyal | filemerge: print the filename in quotes in prompt | file | diff | annotate |