Skip to content

Commit 106be3d

Browse files
committed
cleanup
1 parent fc10aaa commit 106be3d

3 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/DiffEngine/Implementation/P4Merge.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
{
33
public static Definition P4Merge()
44
{
5-
var launchArguments2 = new LaunchArguments(
6-
Left: (temp, target) => $"\"{target}\" \"{temp}\"",
7-
Right: (temp, target) => $"\"{temp}\" \"{target}\"");
85
var launchArguments = new LaunchArguments(
96
Left: (temp, target) =>
107
{

src/DiffEngineTray/HotKey/KeyRegister.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public bool TryAddBinding(int id, bool shift, bool control, bool alt, string key
4242

4343
public bool TryAddBinding(int id, KeyModifiers modifiers, Keys keys, Action action)
4444
{
45-
var unregisterHotKey = UnregisterHotKey(handle, id);
45+
UnregisterHotKey(handle, id);
4646

4747
if (!RegisterHotKey(handle, id, modifiers, keys))
4848
{

src/DiffEngineTray/Tracker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public void AcceptOpen()
300300
{
301301
AcceptAllDeletes();
302302

303-
foreach (var (key, move) in moves)
303+
foreach (var move in moves.Values)
304304
{
305305
if (move.Process == null)
306306
{

0 commit comments

Comments
 (0)