thenigan

#!/bin/sh -e
# Copyright 2010, Tim Henigan <[email protected]>
#
# Perform a directory diff between commits in the repository using
# the external diff tool specified in the 'diff.tool' configuration
# option.

USAGE='<options> <commit>{0,2} -- <path>*

--cached  Compare to the index rather than the working tree

thenigan

#!/bin/sh -e
# Copyright 2010, Tim Henigan <[email protected]>
#
# A simple launcher for gitk which will print usage instructions
# if requested

for i in $*
do
    case "$i" in
    -h|--h|--he|--hel|--help)

thenigan

class ExampleClass:
    classVar = "classVar"
    def __init__(self):
        self.instanceVar = "instanceVar"

class BorgClass:
    __shared_state = {}
    classVar = "classVar"
    def __init__(self):
        self.__dict__ = self.__shared_state        

thenigan

#!/bin/sh
# git-mergetool--lib is a library for common merge tool functions
diff_mode() {
	test "$TOOL_MODE" = diff
}

merge_mode() {
	test "$TOOL_MODE" = merge
}

thenigan

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" >/dev/null 2>&1
		status=$?
	else

thenigan

From 8d1944e1c408030bab2ebb90b8c24fb4294c7fea Mon Sep 17 00:00:00 2001
From: Tim Henigan <[email protected]>
Date: Thu, 1 Mar 2012 14:19:32 -0500
Subject: [PATCH] mergetools: add support for DeltaWalker

Since bc7a96a8965d, integration with external diff/merge tools requires
a mergetools/$tool file to be present.

This commits adds DeltaWalker support.

thenigan

#
# A fatal error has been detected by the Java Runtime Environment:
#
#  EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x6d89019f, pid=7636, tid=1388
#
# JRE version: 6.0_31-b05
# Java VM: Java HotSpot(TM) Client VM (20.6-b01 mixed mode, sharing windows-x86 )
# Problematic frame:
# V  [jvm.dll+0xa019f]
#

thenigan

Rough site map (split up by account type):

- Anonymous
    * List of game servers
    * List of recent games played by anyone on any server
    * List of recent games played by anyone on specific server
    * List of games for specific Player account (single nick on single server)(includes Total #, W/L, %)
    * NOT ALLOWED to view User profiles
    * NOT ALLOWED to see all nicks for User on server
    * NOT ALLOWED to see AGA ID of player nicks