diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-05-07 15:50:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-07 15:51:17 -0700 |
| commit | 1dc51c663c0a1c58c935677c614d31ddf687b3f1 (patch) | |
| tree | 1fbfdcd71945363fad840f23f472ad6015442da8 /git-merge-resolve.sh | |
| parent | Merge branch 'cl/p4-use-diff-tree' (diff) | |
| download | tgif-1dc51c663c0a1c58c935677c614d31ddf687b3f1.tar.xz | |
Update draft release notes for 2.0
Describe one last minute one-liner fix for regression introduced in
1.9, and fix a grave mischaracterization on a recent remote-hg/bzr
change, pointed out by Felipe.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions