>>> "TH" == Tassilo Horn <t...@gnu.org> writes:

> Philip Oakley <philipoakley@iee.email> writes:
> Hi again,

>> If you do come up with a reasonably simple script for this purpose, it 
>> maybe worth proposing to the Git-List for possible inclusion in the 
>> /contrib part of the git hierarchy as part of being inclusive of other 
>> folks problems ;-)

> I currently use this:

> #!/bin/sh

Interesting, thanks.

I just pulled from emacs repository and run the script on a couple of
files for example


th-check-conflict.sh ChangeLog.2


    LOC changed |       % | branch
       54/35805 |    .15% | origin/emacs-27
       54/35805 |    .15% | origin/feature/icomplete-vertical
        6/35805 |    .01% | origin/feature/integration-of-dictionary-el
       54/35805 |    .15% | origin/feature/simple-16-theme
        6/35805 |    .01% | origin/scratch/eldoc-display-functions
       54/35805 |    .15% | origin/scratch/erc-oldies
      544/35805 |   1.51% | origin/scratch/gnus-search
       54/35805 |    .15% | origin/scratch/modern-mode
       54/35805 |    .15% | origin/scratch/shorthand-namespacing

I'll think about how to use it in mercurial ;-)

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/87wnydra4c.fsf%40mat.ucm.es.

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Reply via email to