diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-15 23:08:41 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-15 23:08:41 +0400 |
| commit | ea56a7ed971f3bd547abb16a3cb9a41c00133c85 (patch) | |
| tree | 774e0039fb71f74ed612014d36ddd50c6014838a /git.c | |
| parent | 4bd874c8f30d55b6189dacf1d769855ed2df4299 (diff) | |
| parent | 21baa6e0c56d229866c02c4b42b8b53af648d853 (diff) | |
Merge branch 'wp/merge-tree-fix'
* wp/merge-tree-fix:
merge-tree: fix where two branches share no changes
add basic tests for merge-tree
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions