From 7627b8b6d9ef6e57dbd20a55b946bd1991c1223e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Mon, 12 Aug 2013 18:31:00 +0200 Subject: [PATCH] correct a typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 438da45fc..092db1954 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ Following are some commands that can be used there: * `Ctrl + Alt + M` - automerge as much as possible * `b` - jump to next merge conflict * `s` - change the order of the conflicted lines -* `u` - undo an merge +* `u` - undo a merge * `left mouse button` - mark a block to be the winner * `middle mouse button` - mark a line to be the winner * `Ctrl + S` - save -- 2.39.5