diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:18 -0700 |
| commit | 4e327bb4c251fc642660e35252543c830d2ca2b7 (patch) | |
| tree | 86165966f1af2b431adbd06c51da62f5c4627f48 /t/t6038-merge-text-auto.sh | |
| parent | Merge branch 'ak/t4151-ls-files-could-be-empty' into maint (diff) | |
| parent | remote.c: specify correct plural form in "commit diverge" message (diff) | |
| download | tgif-4e327bb4c251fc642660e35252543c830d2ca2b7.tar.xz | |
Merge branch 'nd/remote-plural-ours-plus-theirs' into maint
Message fix.
* nd/remote-plural-ours-plus-theirs:
remote.c: specify correct plural form in "commit diverge" message
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions