On Sat, Feb 19, 2011 at 10:22 AM, Martin Langhoff
<martin.langhoff@xxxxxxxxx> wrote:
> git merge-helper --prefer-path foo/preferred/README
The concrete example in this repo could be
gitk pg master -- trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs \
etherpad/src/themes/default/templates/store/eepnet_eval_signup.ejs \
etherpad/src/templates/store/eepnet_eval_signup.ejs
The ideal thing would be to have a helper that knows what to do if I say
git merge-helper --prefer
etherpad/src/themes/default/templates/store/eepnet_eval_signup.ejs
cheers,
m
--
martin.langhoff@xxxxxxxxx
martin@xxxxxxxxxx -- Software Architect - OLPC
- ask interesting questions
- don't get distracted with shiny stuff - working code first
- http://wiki.laptop.org/go/User:Martinlanghoff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html