Andrew's git / gitweb.git / diff
?
Merge branch 'sb/unpack-trees-grammofix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:05 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:05 +0000 (15:19 -0800)
* sb/unpack-trees-grammofix:
unpack-trees: fix grammar for untracked files in directories

1  2 
t/t7609-merge-co-error-msgs.sh patch | diff1 | diff2 | blob | history
unpack-trees.c patch | diff1 | diff2 | blob | history
diff --cc t/t7609-merge-co-error-msgs.sh
Simple merge
diff --cc unpack-trees.c
Simple merge