diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-18 11:49:31 -0700 |
| commit | e7e656c09ab6bb0eda6312045cb5d61448309bcb (patch) | |
| tree | f94e0a4f00c47bc60040b9f354f43a83f91848df /gettext.h | |
| parent | Merge branch 'jk/http-dumb-namespaces' (diff) | |
| parent | merge-tree: don't print entries that match "local" (diff) | |
| download | tgif-e7e656c09ab6bb0eda6312045cb5d61448309bcb.tar.xz | |
Merge branch 'jk/merge-tree-added-identically'
The resolution of some corner cases by "git merge-tree" were
inconsistent between top-of-the-tree and in a subdirectory.
* jk/merge-tree-added-identically:
merge-tree: don't print entries that match "local"
Diffstat (limited to 'gettext.h')
0 files changed, 0 insertions, 0 deletions