From 144837afdfab98d6a9f753bc4ccc1feede410101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Mon, 12 Aug 2013 18:31:21 +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 a8a53b18a..a6b7cdb4d 100644 --- a/README.md +++ b/README.md @@ -204,7 +204,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