Merge branch 'ah/grammofix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:35 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:35 +0000 (11:38 -0700)
* ah/grammofix:
grammofix in user-facing messages

1  2 
builtin/commit.c
builtin/merge.c
builtin/notes.c
git-stash.sh
git.c
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc builtin/notes.c
Simple merge
diff --cc git-stash.sh
Simple merge
diff --cc git.c
Simple merge