| commit | e7e656c09ab6bb0eda6312045cb5d61448309bcb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Apr 2013 18:49:31 +0000 (18 11:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Apr 2013 18:49:31 +0000 (18 11:49 -0700) | ||
| tree | f94e0a4f00c47bc60040b9f354f43a83f91848df | treesnapshot (tar.gz zip) |
| parent | 77354d8cdc6e0bf407de23d762760cccee5d757c | commitdiff |
| parent | aacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 | commitdiff |
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"
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"