diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-02 17:19:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-02 17:19:54 (GMT) |
| commit | 6e916ab43913c1703eca314d15016761b5285616 (patch) | |
| tree | 80beb1b990bfc5673d067640cfbcbe1181573cf8 /Reintegrate | |
| parent | 411b5ebe488162e45606a10b7371c75e6e55e443 (diff) | |
| download | git-6e916ab43913c1703eca314d15016761b5285616.zip git-6e916ab43913c1703eca314d15016761b5285616.tar.gz git-6e916ab43913c1703eca314d15016761b5285616.tar.bz2 | |
Reintegrate: only detect conflict markers in conflicted files
Otherwise we would misidentify new sections in documentation set
marked with ======= as conflict markers.
Diffstat (limited to 'Reintegrate')
| -rwxr-xr-x | Reintegrate | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Reintegrate b/Reintegrate index cb75f12..dfc5184 100755 --- a/Reintegrate +++ b/Reintegrate @@ -22,8 +22,9 @@ accept_rerere () { then return 1 fi - if git diff HEAD | - grep -e "^+<<<<<<<" -e "^+=======" -e "^+>>>>>>>" >/dev/null + if git diff | + grep -e "^.+" -e "^+." | + grep -e "^..<<<<<<<" -e "^..=======" -e "^..>>>>>>>" >/dev/null then return 1 else |