diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:01:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-13 11:01:15 -0700 |
| commit | f7d59e256884f63adeed9a1f3376a386a28681ff (patch) | |
| tree | d79d33ee5fa727db52c2bcba4c5e66841538d102 /diff.c | |
| parent | 3e1a363b1ff748237f3a6e4f3e2803445f09c54c (diff) | |
| parent | 75973b2cb58bf2b3038c5c214fc0a1b96d6868fe (diff) | |
| download | git-f7d59e256884f63adeed9a1f3376a386a28681ff.tar.gz | |
Merge branch 'jc/fix-add-u-unmerged'
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions