diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 17:47:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 17:47:17 (GMT) |
| commit | d5c48c531816102d3a86fd807fb19e661a3787d5 (patch) | |
| tree | 931ffa31daf296279e7819496c39d919ce87191d /merge-file.c | |
| parent | ad709ea985b527adb546f4c841fbd480f2c6bdfd (diff) | |
| parent | 74e42ce122bfcbd2e1a06395b80d6a4b44580148 (diff) | |
| download | git-d5c48c531816102d3a86fd807fb19e661a3787d5.zip git-d5c48c531816102d3a86fd807fb19e661a3787d5.tar.gz git-d5c48c531816102d3a86fd807fb19e661a3787d5.tar.bz2 | |
Merge branch 'maint'
* maint:
add-interactive: Clarify “remaining hunks in the file”
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions